Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs	(revision 358)
@@ -158,7 +158,7 @@
         /// <summary>
         /// åˆ�æœŸåŒ–
         /// </summary>
-        public static void Initialize()
+        public static bool Initialize()
         {
             try
             {
@@ -169,11 +169,14 @@
                 DBCommon.Instance.Initialize();
 
                 // ç®¡ç�†ãƒžã‚¹ã‚¿å�–å¾—
-                SetSystemMaster();
+                if (!SetSystemMaster()) return false;
+
+                return true;
             }
             catch (Exception ex)
             {
                 logger.ErrorFormat("åˆ�æœŸåŒ–ã‚¨ãƒ©ãƒ¼:{0}ï¼š{1}", GetMethodName(), ex.Message);
+                return false;
             }
         }
         #endregion
Index: branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs	(revision 358)
@@ -14,7 +14,7 @@
         /// <summary>
         /// æœ¬ä½“ãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
         /// </summary>
-        public static int s_SystemVersion = 208;
+        public static int s_SystemVersion = 210;
 
         /// <summary>
         /// ã‚³ãƒ”ãƒ¼ãƒ»ç’°å¢ƒãƒ�ãƒ¼ã‚¸ãƒ§ãƒ³
Index: branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs	(revision 358)
@@ -481,10 +481,12 @@
 
         #endregion
 
+        #region ç·¨é›†ãƒ•ãƒ©ã‚°
         /// <summary>
         /// ç·¨é›†ãƒ•ãƒ©ã‚°
         /// </summary>
         static int m_EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
+        #endregion
 
         #region èµ·å‹•å‡¦ç�†
         /// <summary>
@@ -3889,8 +3891,9 @@
             FrmVehicleCalendar frm = new FrmVehicleCalendar();
             try
             {
-                frm.SelectVehicleCode = CurrentPara.IntExecParameter[0];
-                frm.ToMounth = CurrentPara.IntExecParameter[1];
+                frm.ToMounth = CurrentPara.IntExecParameter[0];
+                frm.SelectVehicleCode = CurrentPara.IntExecParameter[1];
+                frm.DirectFlg = CurrentPara.BoolExecParameter[0];
 
                 // ãƒ•ã‚©ãƒ¼ãƒ è¡¨ç¤º
                 frm.ShowDialog();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs	(revision 358)
@@ -508,7 +508,7 @@
                         }
                         else
                         {
-                            ConstrName = string.Format("{0}�F–¢�ì�¬", CommonMotions.cnvString(objwrk[(int)GetDataColumns.ConstructionName]));
+                            ConstrName = string.Format("{0}�F–¢�\�¿", CommonMotions.cnvString(objwrk[(int)GetDataColumns.ConstructionName]));
                         }
                     }
                     // �sƒf�[ƒ^ƒZƒbƒg
@@ -995,9 +995,17 @@
 
                 strSQL.Append(" WHERE");
                 strSQL.Append(" LedgerDetail.SourceCode = A.ConstructionCode");
-                strSQL.AppendFormat(" And LedgerDetail.PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate);
+                strSQL.AppendFormat(" And LedgerDetail.PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);
+                strSQL.Append(" And LedgerDetail.CompanyCode > 0");
 
-                //strSQL.AppendFormat(" WHERE NOT EXISTS(SELECT * FROM PROCESSAPPROVAL APP WHERE APP.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND APP.ApprovalCode = {0})", m_ApprovalCode);
+                strSQL.Append(" And NOT EXISTS(Select * From purchaseorderdetail As OdrDe");
+                strSQL.Append(" Inner Join processapprovaldetail As Exe");
+                strSQL.Append(" ON Exe.ConstructionCode = OdrDe.SourceCode");
+                strSQL.AppendFormat(" And Exe.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
+                strSQL.Append(" And Exe.LinkCode = OdrDe.SeqNo");
+                strSQL.Append(" Where OdrDe.ConstructionCode = LedgerDetail.SourceCode");
+                strSQL.Append(" And OdrDe.SourceDetailCnt = LedgerDetail.DetailCount)");
+
                 strSQL.Append(" AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
                 strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG <= {0}", ProgressComplete);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs	(revision 358)
@@ -440,7 +440,7 @@
                 // �³”F�Ï‚Ýƒ`ƒFƒbƒN
                 if (!CheckUserAppStat()) return;
 
-                    // �³”F�‡�˜ƒ`ƒFƒbƒN
+                // �³”F�‡�˜ƒ`ƒFƒbƒN
                 if (!ChkApprovalOrder()) return;
 
                 // ‰æ–Ê�€–Úƒ`ƒFƒbƒN
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs	(revision 358)
@@ -1128,6 +1128,7 @@
                     case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval:                  // 2:ç©�ç®—äºˆç®—æ›¸æ‰¿èª�
                     case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval:              // 3:å·¥äº‹äºˆç®—æ›¸æ‰¿èª�
                     case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval:                   // 7:è­°äº‹éŒ²æ‰¿èª�
+                    case (int)ClsExcute.ApprovalListNo.SafetyPatrol:                            // 13:å®‰å…¨ãƒ‘ãƒˆãƒ­ãƒ¼ãƒ«
                         break;
                     case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval:              // 4:æ³¨æ–‡æ›¸æ‰¿èª�
                         ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true);        // ----- ç›´æŽ¥è¡¨ç¤ºãƒ•ãƒ©ã‚°
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs	(revision 358)
@@ -1391,7 +1391,7 @@
             try
             {
                 // ŠÇ—�ƒ}ƒXƒ^Žæ“¾
-                CommonMotions.SetSystemMaster();
+                //CommonMotions.SetSystemMaster();
 
                 // �HŽ–�ó‘Ôƒtƒ‰ƒO�iƒeƒLƒXƒg•\Ž¦�j
                 SetStatusText();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs	(revision 358)
@@ -359,8 +359,15 @@
         private string[] s_NegoStr = new string[] { "", "�Ï", "’†" };
         #endregion
 
+        #region ƒOƒŠƒbƒhƒJƒ‰�[’Ê�í�FƒGƒŠƒA
+        /// <summary>
+        /// ƒOƒŠƒbƒhƒJƒ‰�[’Ê�í�FƒGƒŠƒA
+        /// </summary>
+        private Color[] m_GridColor = new Color[] { Color.FromArgb(255, 255, 192) , Color.FromArgb(255, 224, 192) };
         #endregion
 
+        #endregion
+
         #region •Ï�”
         /// <summary>
         /// �‰ŠúŽžƒtƒ‰ƒO
@@ -747,7 +754,7 @@
 
                 // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-                if (bApproval)
+                if (bApproval && !m_SubForm)
                 {
                     // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
                     int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
@@ -1028,7 +1035,7 @@
             // ‘I‘ð�s�”‚ð‘Þ”ð
             m_BeforeGridRow = dgv.CurrentRow.Index;
             // �s‘I‘ð�F‚ð�Ý’è
-            SelectRowChangeColor(m_BeforeGridRow);
+            SelectRowChangeColor();
         }
         #endregion
 
@@ -1249,6 +1256,9 @@
             IOConstructionBudget BudgetDB = new IOConstructionBudget();
             try
             {
+                // �\�¿�E�³”FŽž�FŠó–]�EŽÀ�s‹àŠzƒ`ƒFƒbƒN
+                if (!CheckApprovalValue()) return;
+
                 // �ÏŽZ—\ŽZƒf�[ƒ^‚ª–³‚¢�ê�‡‚Í“o˜^‚·‚é
                 string strSQL = BudgetDB.CreatePrimarykeyString(m_ConstructionCode);
                 ConstructionBudget DataRec = new ConstructionBudget();
@@ -1302,6 +1312,9 @@
         {
             try
             {
+                // �\�¿�E�³”FŽž�FŠó–]�EŽÀ�s‹àŠzƒ`ƒFƒbƒN
+                if (!CheckApprovalValue()) return;
+
                 // ƒf�[ƒ^•Ï�X—LŽž‚Íƒf�[ƒ^“o˜^
                 if (m_bChengeAns)
                 {
@@ -1362,6 +1375,9 @@
             FrmApprovalScreen frm = new FrmApprovalScreen();
             try
             {
+                // �\�¿�E�³”FŽž�FŠó–]�EŽÀ�s‹àŠzƒ`ƒFƒbƒN
+                if (!CheckApprovalValue()) return;
+
                 if (MessageBox.Show("ˆÄŒ�‚ð�³”F‚µ‚Ü‚·�A‚æ‚ë‚µ‚¢‚Å‚·‚©�H�B", "�³”FŠm”F"
                                 , MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return;
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs	(revision 358)
@@ -28,29 +28,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
             this.btnDataDelete = new System.Windows.Forms.Button();
             this.btnDataEntry = new System.Windows.Forms.Button();
             this.btnEnd = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.pnlApprovalButton = new System.Windows.Forms.Panel();
+            this.btnOnApproval = new System.Windows.Forms.Button();
+            this.btnNotApproval = new System.Windows.Forms.Button();
+            this.btnOnHold = new System.Windows.Forms.Button();
             this.pnlApproval = new System.Windows.Forms.Panel();
             this.lblApprovalCount = new System.Windows.Forms.Label();
             this.btnPetition = new System.Windows.Forms.Button();
             this.btnApproval = new System.Windows.Forms.Button();
-            this.pnlApprovalButton = new System.Windows.Forms.Panel();
-            this.btnOnApproval = new System.Windows.Forms.Button();
-            this.btnNotApproval = new System.Windows.Forms.Button();
-            this.btnOnHold = new System.Windows.Forms.Button();
             this.lblLabel06 = new System.Windows.Forms.Label();
             this.label23 = new System.Windows.Forms.Label();
             this.pnlGroup2 = new System.Windows.Forms.Panel();
@@ -118,8 +118,8 @@
             this.btnOtherProc = new System.Windows.Forms.Button();
             this.btnChangeExpenses = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
+            this.pnlApprovalButton.SuspendLayout();
             this.pnlApproval.SuspendLayout();
-            this.pnlApprovalButton.SuspendLayout();
             this.pnlGroup2.SuspendLayout();
             this.pnlGroup1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -220,6 +220,57 @@
             this.panel1.Size = new System.Drawing.Size(1330, 160);
             this.panel1.TabIndex = 0;
             // 
+            // pnlApprovalButton
+            // 
+            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlApprovalButton.AutoSize = true;
+            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
+            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
+            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
+            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
+            this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0);
+            this.pnlApprovalButton.Name = "pnlApprovalButton";
+            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
+            this.pnlApprovalButton.TabIndex = 49;
+            this.pnlApprovalButton.Visible = false;
+            // 
+            // btnOnApproval
+            // 
+            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
+            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
+            this.btnOnApproval.Name = "btnOnApproval";
+            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
+            this.btnOnApproval.TabIndex = 34;
+            this.btnOnApproval.TabStop = false;
+            this.btnOnApproval.Text = "æ‰¿èª�";
+            this.btnOnApproval.UseVisualStyleBackColor = false;
+            this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click);
+            // 
+            // btnNotApproval
+            // 
+            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
+            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
+            this.btnNotApproval.Name = "btnNotApproval";
+            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
+            this.btnNotApproval.TabIndex = 35;
+            this.btnNotApproval.TabStop = false;
+            this.btnNotApproval.Text = "ä¸�æ‰¿èª�";
+            this.btnNotApproval.UseVisualStyleBackColor = false;
+            this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click);
+            // 
+            // btnOnHold
+            // 
+            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
+            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
+            this.btnOnHold.Name = "btnOnHold";
+            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
+            this.btnOnHold.TabIndex = 36;
+            this.btnOnHold.TabStop = false;
+            this.btnOnHold.Text = "ä¿�ç•™";
+            this.btnOnHold.UseVisualStyleBackColor = false;
+            this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click);
+            // 
             // pnlApproval
             // 
             this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -275,57 +326,6 @@
             this.btnApproval.UseVisualStyleBackColor = false;
             this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
             // 
-            // pnlApprovalButton
-            // 
-            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlApprovalButton.AutoSize = true;
-            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
-            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
-            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
-            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
-            this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0);
-            this.pnlApprovalButton.Name = "pnlApprovalButton";
-            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
-            this.pnlApprovalButton.TabIndex = 49;
-            this.pnlApprovalButton.Visible = false;
-            // 
-            // btnOnApproval
-            // 
-            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
-            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
-            this.btnOnApproval.Name = "btnOnApproval";
-            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
-            this.btnOnApproval.TabIndex = 34;
-            this.btnOnApproval.TabStop = false;
-            this.btnOnApproval.Text = "æ‰¿èª�";
-            this.btnOnApproval.UseVisualStyleBackColor = false;
-            this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click);
-            // 
-            // btnNotApproval
-            // 
-            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
-            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
-            this.btnNotApproval.Name = "btnNotApproval";
-            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
-            this.btnNotApproval.TabIndex = 35;
-            this.btnNotApproval.TabStop = false;
-            this.btnNotApproval.Text = "ä¸�æ‰¿èª�";
-            this.btnNotApproval.UseVisualStyleBackColor = false;
-            this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click);
-            // 
-            // btnOnHold
-            // 
-            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
-            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
-            this.btnOnHold.Name = "btnOnHold";
-            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
-            this.btnOnHold.TabIndex = 36;
-            this.btnOnHold.TabStop = false;
-            this.btnOnHold.Text = "ä¿�ç•™";
-            this.btnOnHold.UseVisualStyleBackColor = false;
-            this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click);
-            // 
             // lblLabel06
             // 
             this.lblLabel06.BackColor = System.Drawing.Color.White;
@@ -836,14 +836,14 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
             this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
@@ -884,8 +884,8 @@
             // 
             // Column1
             // 
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column1.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
             this.Column1.Frozen = true;
             this.Column1.HeaderText = "â„–";
             this.Column1.Name = "Column1";
@@ -937,8 +937,8 @@
             // 
             // Column5
             // 
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle3;
             this.Column5.Frozen = true;
             this.Column5.HeaderText = "é …ã€€ã€€ã€€ç›®";
             this.Column5.Name = "Column5";
@@ -948,8 +948,8 @@
             // 
             // Column6
             // 
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.Column6.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.Column6.DefaultCellStyle = dataGridViewCellStyle4;
             this.Column6.Frozen = true;
             this.Column6.HeaderText = "å·¥ã€€äº‹ã€€å†…ã€€å®¹";
             this.Column6.Name = "Column6";
@@ -988,12 +988,12 @@
             // 
             // Column7
             // 
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle15.Format = "N0";
-            dataGridViewCellStyle15.NullValue = null;
-            this.Column7.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle5.Format = "N0";
+            dataGridViewCellStyle5.NullValue = null;
+            this.Column7.DefaultCellStyle = dataGridViewCellStyle5;
             this.Column7.HeaderText = "ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�";
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
@@ -1002,10 +1002,10 @@
             // 
             // Column8
             // 
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column8.DefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column8.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column8.HeaderText = "ç©�ç®—æ™‚äº¤æ¸‰é‡‘é¡�";
             this.Column8.Name = "Column8";
             this.Column8.ReadOnly = true;
@@ -1014,10 +1014,10 @@
             // 
             // Column11
             // 
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column11.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column11.DefaultCellStyle = dataGridViewCellStyle7;
             this.Column11.HeaderText = "ç™ºæ³¨å¸Œæœ›é‡‘é¡�ï¼Šæ‹…å½“è€…è¨˜å…¥";
             this.Column11.Name = "Column11";
             this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -1025,8 +1025,8 @@
             // 
             // Column18
             // 
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.Column18.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Column18.DefaultCellStyle = dataGridViewCellStyle8;
             this.Column18.HeaderText = "äº¤æ¸‰";
             this.Column18.Name = "Column18";
             this.Column18.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -1035,10 +1035,10 @@
             // 
             // Column12
             // 
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column12.DefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column12.DefaultCellStyle = dataGridViewCellStyle9;
             this.Column12.HeaderText = "å®Ÿè¡Œé‡‘é¡�";
             this.Column12.Name = "Column12";
             this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
@@ -1046,9 +1046,9 @@
             // 
             // Column9
             // 
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Column9.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Column9.DefaultCellStyle = dataGridViewCellStyle10;
             this.Column9.HeaderText = "æ¯”çŽ‡(ï¼…)";
             this.Column9.Name = "Column9";
             this.Column9.ReadOnly = true;
@@ -1170,8 +1170,8 @@
             this.SizeChanged += new System.EventHandler(this.FrmConstructionBudget_SizeChanged);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.pnlApprovalButton.ResumeLayout(false);
             this.pnlApproval.ResumeLayout(false);
-            this.pnlApprovalButton.ResumeLayout(false);
             this.pnlGroup2.ResumeLayout(false);
             this.pnlGroup2.PerformLayout();
             this.pnlGroup1.ResumeLayout(false);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.resx
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.resx	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.resx	(revision 358)
@@ -120,9 +120,6 @@
   <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs	(revision 358)
@@ -930,15 +930,18 @@
         /// è¡Œã‚’é�¸æŠžè‰²ã�«ã�™ã‚‹
         /// </summary>
         /// <param name="CurrentRow"></param>
-        private void SelectRowChangeColor(int CurrentRow)
+        private void SelectRowChangeColor()
         {
             DataGridViewEX dgv = dgvAllDisplay;
-            DataGridViewRow CurRow = dgv.Rows[CurrentRow];
+            DataGridViewRow CurRow = dgv.Rows[m_BeforeGridRow];
 
             // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
             for (int i = 0; i < dgv.ColumnCount; i++)
             {
-                dgv.Rows[m_BeforeGridRow].Cells[i].Style.BackColor = s_RowSelectColor;
+                // ã‚¨ãƒ©ãƒ¼ã‚»ãƒ«ã�¯è‰²ã‚’å¤‰ã�ˆã�ªã�„
+                if (CurRow.Cells[i].Style.BackColor == CommonDefine.s_clrError) continue;
+                // é�¸æŠžè‰²ã‚»ãƒƒãƒˆ
+                CurRow.Cells[i].Style.BackColor = s_RowSelectColor;
             }
         }
         #endregion
@@ -1022,24 +1025,25 @@
                     // è¡Œã�®è‰²ã‚’å¤‰ã�ˆã‚‹
                     for (int i = 0; i < (int)GridColumn.BlankFlg; i++)
                     {
-                        dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.White;
+                        if (CurRow.Cells[i].Style.BackColor == CommonDefine.s_clrError) continue;
+                        CurRow.Cells[i].Style.BackColor = Color.White;
                         switch (i)
                         {
                             // ç©�ç®—æ™‚è¦‹ç©�é‡‘é¡�
                             case (int)GridColumn.EstimatePrice:
-                                dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(192, 255, 255);
+                                CurRow.Cells[i].Style.BackColor = Color.FromArgb(192, 255, 255);
                                 break;
                             // ç©�ç®—æ™‚äº¤æ¸‰é‡‘é¡�
                             case (int)GridColumn.NegotiationPrice:
-                                dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(192, 255, 192);
+                                CurRow.Cells[i].Style.BackColor = Color.FromArgb(192, 255, 192);
                                 break;
                             // ç™ºæ³¨å¸Œæœ›é‡‘é¡�
                             case (int)GridColumn.HopePrice:
-                                dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(255, 255, 192);
+                                CurRow.Cells[i].Style.BackColor = Color.FromArgb(255, 255, 192);
                                 break;
                             // å®Ÿè¡Œé‡‘é¡�
                             case (int)GridColumn.ExecPrice:
-                                dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(255, 224, 192);
+                                CurRow.Cells[i].Style.BackColor = Color.FromArgb(255, 224, 192);
                                 break;
                         }
                     }
@@ -4813,5 +4817,88 @@
             }
         }
         #endregion
+
+        #region ç”³è«‹ãƒ»æ‰¿èª�æ™‚ï¼šå¸Œæœ›ãƒ»å®Ÿè¡Œé‡‘é¡�ãƒ�ã‚§ãƒƒã‚¯
+        /// <summary>
+        /// ç”³è«‹ãƒ»æ‰¿èª�æ™‚ï¼šå¸Œæœ›ãƒ»å®Ÿè¡Œé‡‘é¡�ãƒ�ã‚§ãƒƒã‚¯
+        /// </summary>
+        /// <returns></returns>
+        private bool CheckApprovalValue()
+        {
+            try
+            {
+                int nStart = (int)DataGroup.CommonTempCosts;
+                int nComp = (int)DataGroup.DisposeCosts;
+                int nHopeCount = (int)GridColumn.HopePrice;
+                int nExecCount = (int)GridColumn.ExecPrice;
+                bool diffValue = false;
+                foreach (DataGridViewRow CurRow in dgvAllDisplay.Rows)
+                {
+                    // å¯¾è±¡ä»¥å¤–ã�¯å‡¦ç�†ã�—ã�ªã�„
+                    int nGroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
+                    if (nGroupNo < nStart || nComp < nGroupNo) continue;
+
+                    // ãƒ‡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                    // æ˜Žç´°ãƒ�ã‚§ãƒƒã‚¯
+                    if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TotalFlg].Value)) continue;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue;
+
+                    if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TitleFlg].Value)) continue;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) continue;
+
+                    if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.BlankFlg].Value)) continue;
+                    if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.BlankFlg].Value) == 1) continue;
+
+                    // ç©ºç™½è¡Œã�¯å‡¦ç�†ã�—ã�ªã�„
+                    if (BlankLine(CurRow.Index)) continue;
+
+                    // é€šå¸¸è‰²
+                    CurRow.Cells[nHopeCount].Style.BackColor = m_GridColor[0];
+                    CurRow.Cells[nExecCount].Style.BackColor = m_GridColor[1];
+
+                    int nHopePrice = CommonMotions.cnvInt(CurRow.Cells[nHopeCount].Value);   // ç™ºæ³¨å¸Œæœ›é‡‘é¡�
+                    int nExecPrice = CommonMotions.cnvInt(CurRow.Cells[nExecCount].Value);   // å®Ÿè¡Œé‡‘é¡�
+
+                    if (nHopePrice != nExecPrice && nHopePrice > nExecPrice)
+                    {
+                        // ã‚¨ãƒ©ãƒ¼è‰²
+                        CurRow.Cells[nHopeCount].Style.BackColor = CommonDefine.s_clrError;
+                        CurRow.Cells[nExecCount].Style.BackColor = CommonDefine.s_clrError;
+                        diffValue = true;
+                    }
+                }
+
+                // å·®ç•°ãƒ�ã‚§ãƒƒã‚¯
+                if(diffValue)
+                {
+                    if (pnlApproval.Visible)
+                    {
+                        if (MessageBox.Show("ç™ºæ³¨å¸Œæœ›é‡‘é¡�ã�¨å®Ÿè¡Œé‡‘é¡�ã�«å·®ç•°ã�Œã�‚ã‚Šã�¾ã�™ã€�ç”³è«‹ã�—ã�¾ã�™ã�‹ï¼Ÿ"
+                                        , "æ‰¿èª�ç”³è«‹ã‚¨ãƒ©ãƒ¼"
+                                        , MessageBoxButtons.OKCancel
+                                        , MessageBoxIcon.Error) == DialogResult.Cancel)
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("ç™ºæ³¨å¸Œæœ›é‡‘é¡�ã�¨å®Ÿè¡Œé‡‘é¡�ã�«å·®ç•°ã�Œã�‚ã‚Šã�¾ã�™ã€�æ‰¿èª�ã�§ã��ã�¾ã�›ã‚“ã€‚"
+                                        , "æ‰¿èª�ç”³è«‹ã‚¨ãƒ©ãƒ¼"
+                                        , MessageBoxButtons.OK
+                                        , MessageBoxIcon.Error);
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+        }
+        #endregion
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs	(revision 358)
@@ -1133,7 +1133,7 @@
             dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold);
             this.Column12.DefaultCellStyle = dataGridViewCellStyle6;
             this.Column12.Frozen = true;
-            this.Column12.HeaderText = "å®Ÿã€€è¡Œã€€é‡‘ã€€é¡�";
+            this.Column12.HeaderText = "äºˆç®—æ›¸å®Ÿè¡Œé‡‘é¡�";
             this.Column12.Name = "Column12";
             this.Column12.ReadOnly = true;
             this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs	(revision 358)
@@ -2462,10 +2462,15 @@
                 // å�ˆè¨ˆå€¤å�–å¾—
                 GetDetailTotal(ref EstimateValue, ref ExecValue, ref PercentValue, ref TotalValue, ref ResultValue, ref MTotal);
 
+                // å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�–å¾—
+                long lPurchasePrice = GetLoopBeginValue();
+
                 // äºˆå®šé‡‘é¡�ï¼ˆå�—æ³¨é‡‘é¡�ï¼�äºˆå®šé‡‘é¡�å�ˆè¨ˆï¼‰
-                int EstimatePrice = OrdersPrice - EstimateValue;
+                long EstimatePrice = OrdersPrice - EstimateValue;
                 // å®Ÿè¡Œé‡‘é¡�ï¼ˆå�—æ³¨é‡‘é¡�ï¼�å®Ÿè¡Œé‡‘é¡�å�ˆè¨ˆï¼‰
-                int ExecPrice = OrdersPrice - ExecValue;
+                long ExecPrice = OrdersPrice - ExecValue;
+                // å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�–å¾—ï¼ˆå�—æ³¨é‡‘é¡�ï¼�å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�ˆè¨ˆï¼‰
+                long POrderPrice = OrdersPrice - lPurchasePrice;
 
                 // ç´”åˆ©ç›Šè¡Œã‚«ã‚¦ãƒ³ãƒˆå�–å¾—
                 int LineCnt = m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine];
@@ -2475,6 +2480,7 @@
                 dgv.Rows[LineCnt].Cells[(int)GridColumn.EstimatePrice].Value = EstimatePrice.ToString("#,0");
                 dgv.Rows[LineCnt].Cells[(int)GridColumn.ExecPrice].Value = ExecPrice.ToString("#,0");
                 dgv.Rows[LineCnt].Cells[(int)GridColumn.Percent].Value = CalculattionPercent((double)ExecPrice).ToString("0.00");
+                dgv.Rows[LineCnt].Cells[(int)GridColumn.OrderPrice].Value = POrderPrice.ToString("#,0");
             }
             catch (Exception ex)
             {
@@ -2483,6 +2489,39 @@
         }
         #endregion
 
+        #region å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�–å¾—
+        /// <summary>
+        /// å®Ÿè¡Œãƒ»ç™ºæ³¨é‡‘é¡�å�–å¾—
+        /// </summary>
+        /// <returns></returns>
+        private long GetLoopBeginValue()
+        {
+            try
+            {
+                long lRet = 0;
+
+                foreach(DataGridViewRow CurRow in dgvAllDisplay.Rows)
+                {
+                    int nGroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
+
+                    if (nGroupNo < (int)DataGroup.Expenses || (int)DataGroup.Payroll < nGroupNo) continue;
+
+                    int nOrderVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderPrice].Value);
+                    int nExecVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value);
+                    if (nOrderVal != 0) lRet += nOrderVal;
+                    else lRet += nExecVal;
+                }
+
+                return lRet;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return 0;
+            }
+        }
+        #endregion
+
         #region ç´”åˆ©ç›Šä½œæˆ�
         /// <summary>
         /// ç´”åˆ©ç›Šä½œæˆ�
@@ -3189,7 +3228,9 @@
                     RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode;
                     RowData[(int)GridColumn.CompanyName] = DetailRec.CompanyName;
                     // å��ç§°ãƒ»ä¼šç¤¾å��ã�Œå…¨ã�¦ã�ªã�„å ´å�ˆã�¯é‡‘é¡�ã‚¯ãƒªã‚¢
-                    if (DetailRec.FirstString.Length == 0 && DetailRec.SecondString.Length == 0 && DetailRec.CompanyName.Length == 0)
+                    if (DetailRec.FirstString.Length == 0
+                        && DetailRec.SecondString.Length == 0
+                        && DetailRec.CompanyName.Length == 0)
                     {
                         RowData[(int)GridColumn.EstimatePrice] = string.Empty;
                         RowData[(int)GridColumn.ExecPrice] = string.Empty;
@@ -3201,9 +3242,9 @@
                         RowData[(int)GridColumn.ExecPrice] = DetailRec.ExecutionAmount.ToString("#,0");
                         RowData[(int)GridColumn.Percent] = DetailRec.AmountConfigRate.ToString("0.00");
                         
-                        // æ–½å·¥è²»ã�®ã�¿æ”¯æ‰•ã�„ä¸Šé™�ã‚’è¡¨ç¤ºã�™ã‚‹
-                        float fSwRate = CommonMotions.cnvFloat(objCurRec[DetailCnt + 3]);
-                        int swValue = CommonMotions.cnvInt(objCurRec[DetailCnt + 2]);
+                        // ----- æ–½å·¥è²»ã�®ã�¿æ”¯æ‰•ã�„ä¸Šé™�ã‚’è¡¨ç¤ºã�™ã‚‹
+                        float fSwRate = CommonMotions.cnvFloat(objCurRec[DetailCnt + 3]);       // ç™ºæ³¨é‡‘é¡�ã‚’å�–å¾—ã�™ã‚‹
+                        int swValue = CommonMotions.cnvInt(objCurRec[DetailCnt + 2]);           // ç™ºæ³¨æ™‚æ³•å®šç¦�åˆ©è²»çŽ‡ã‚’å�–å¾—ã�™ã‚‹
                         if (DetailRec.GroupCount == (int)FrmConstructionLedger.DataGroup.ConstructionCosts
                             && swValue > 0)
                         {
@@ -3279,7 +3320,9 @@
                     // è¨ˆç®—ã�Œå�ˆã‚�ã�ªã��ã�ªã‚‹ã�®ã�§çµŒè²»ä»¥å¤–ã�¯ãƒžã‚¤ãƒŠã‚¹ã�§ã‚‚è¨ˆç®—ã�™ã‚‹ 2017/10/13
                     if (GroupNo != (int)DataGroup.Expenses)
                     {   // çµŒè²»ä»¥å¤–ã�®æ™‚ã�®ã�¿æ”¯æ‰•å�¯èƒ½é¡�ã‚’è¨ˆç®—ã�™ã‚‹
-                        ExecValue = (int)(DetailRec.ExecutionAmount - TotalValue);
+                        int nCalVal = CommonMotions.cnvInt(RowData[(int)GridColumn.OrderPrice]);
+                        if (nCalVal == 0) nCalVal = (int)DetailRec.ExecutionAmount;
+                        ExecValue = nCalVal - (int)TotalValue;
                     }
                     RowData[GridColMax + (int)ColPayTotal.Results] = ExecValue.ToString("#,0");
 
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs	(revision 358)
@@ -581,7 +581,7 @@
 
                 // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-                if (bApproval)
+                if (bApproval && !m_SubForm)
                 {
                     // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
                     int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs	(revision 358)
@@ -657,7 +657,7 @@
 
                 // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-                if (bApproval)
+                if (bApproval && !m_SubForm)
                 {
                     // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
                     int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs	(revision 358)
@@ -22,7 +22,7 @@
 using ProcessManagement.Forms.ControlsAction;
 using ProcessManagement.Forms.CustomControls;
 //*---------------------------- �ÏŽZŒ©�Ï“ü—Í‰æ–Ê ------------------------------*
-//  2015/08/12  Ver1.0.0.0      Create Source           
+//  2015/08/12  Ver1.0.0.0      Create Source
 //
 //
 //
@@ -1193,7 +1193,7 @@
         private void FrmEstimateInput_Load(object sender, EventArgs e)
         {
             // ŠÇ—�ƒ}ƒXƒ^Žæ“¾
-            CommonMotions.SetSystemMaster();
+            //CommonMotions.SetSystemMaster();
 
             //ƒRƒ“ƒgƒ��[ƒ‹ƒIƒuƒWƒFƒNƒgŽæ“¾
             SetDisplayObject();
@@ -1217,7 +1217,7 @@
 
             // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
             bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-            if (bApproval)
+            if (bApproval && !m_SubForm)
             {
                 // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
                 int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
@@ -2199,51 +2199,5 @@
             m_Canceled = true;
         }
         #endregion
-
-        //private void dgvEntryData_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
-        //{
-        //    try
-        //    {
-        //        DataGridViewEX dgv = (DataGridViewEX)sender;
-        //        //•Ò�W‚Ì‚½‚ß‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒRƒ“ƒgƒ��[ƒ‹‚ðŽæ“¾
-        //        DataGridViewTextBoxEditingControl tb = (DataGridViewTextBoxEditingControl)e.Control;
-
-        //        if (dgv.CurrentCell.OwningColumn.ReadOnly) return;
-
-        //        //IME‚Ìƒ‚�[ƒh‚ð•Ï�X‚·‚é
-        //        switch (dgv.CurrentCell.OwningColumn.Index)
-        //        {
-        //            case (int)GridItemColumn.ItemName:                          // –¼�Ì
-        //                // “�Œv‘�ŒvƒOƒŠƒbƒh
-        //                if (!EqualTotalGridPage(dgv)) tb.ImeMode = ImeMode.On;
-        //                break;
-        //            case (int)GridItemColumn.SpecName:                          // ‹KŠi�E�¡–@
-        //                tb.ImeMode = ImeMode.On;
-        //                break;
-        //            case (int)GridItemColumn.UnitName:                          // ’PˆÊ
-        //                // “�Œv‘�ŒvƒOƒŠƒbƒh
-        //                if (!EqualTotalGridPage(dgv)) tb.ImeMode = ImeMode.On;
-        //                break;
-        //            case (int)GridItemColumn.Note:                              // ”õ�l
-        //                tb.ImeMode = ImeMode.On;
-        //                break;
-        //            default:
-        //                tb.ImeMode = ImeMode.Disable;
-        //                break;
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger.ErrorFormat("ƒVƒXƒeƒ€ƒGƒ‰�[�F{0}�F{1}", CommonMotions.GetMethodName(), ex.Message);
-        //    }
-        //}
-
-        //private void dgvEntryData_KeyPress(object sender, KeyPressEventArgs e)
-        //{
-        //    DataGridViewEX dgv = (DataGridViewEX)sender;
-
-        //    if (dgv.CurrentCell.OwningColumn.ReadOnly) return;
-        //    SendKeys.Send("{F2}");  
-        //}
     }
 }
\ No newline at end of file
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.cs	(revision 358)
@@ -500,7 +500,7 @@
 
                 // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-                if (bApproval)
+                if (bApproval && !m_SubForm)
                 {
                     // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
                     int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs	(revision 358)
@@ -309,7 +309,7 @@
 
                 // æ‰¿èª�ç”»é�¢ã�®ã€Œæ‰¿èª�å¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã‚’è¦‹ã‚‹ã€�ã�‹ã‚‰ã�®èµ·å‹•æ™‚ã�¯æ‰¿èª�ãƒœã‚¿ãƒ³ã�®è¡¨ç¤ºã�Œã�‚ã‚‹
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-                if (bApproval)
+                if (bApproval && !m_SubForm)
                 {
                     // å·¥äº‹æ¡ˆä»¶ã�®ç®¡ç�†éƒ¨ç½²ã‚’å�–å¾—ã�™ã‚‹
                     int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs	(revision 358)
@@ -695,7 +695,7 @@
 
                 // �³”F‰æ–Ê‚Ì�u�³”F‘Î�Ûƒf�[ƒ^‚ðŒ©‚é�v‚©‚ç‚Ì‹N“®Žž‚Í�³”Fƒ{ƒ^ƒ“‚Ì•\Ž¦‚ª‚ ‚é
                 bool bApproval = ClsApprovalPermission.ExceApprovalScreen();
-                if (bApproval)
+                if (bApproval && !m_SubForm)
                 {
                     // �HŽ–ˆÄŒ�‚ÌŠÇ—�•”��‚ðŽæ“¾‚·‚é
                     int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmActionCalendar.Designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmActionCalendar.Designer.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmActionCalendar.Designer.cs	(revision 358)
@@ -980,6 +980,7 @@
             this.Controls.Add(this.CalenderTableLayout);
             this.Controls.Add(this.label1);
             this.Font = new System.Drawing.Font("ï¼­ï¼³ æ˜Žæœ�", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
             this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs	(revision 358)
@@ -185,7 +185,7 @@
             this.cmbKen.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbKen.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbKen.FormattingEnabled = true;
-            this.cmbKen.Location = new System.Drawing.Point(120, 5);
+            this.cmbKen.Location = new System.Drawing.Point(120, 7);
             this.cmbKen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cmbKen.Name = "cmbKen";
             this.cmbKen.Size = new System.Drawing.Size(133, 24);
@@ -212,7 +212,7 @@
             this.cmbCity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbCity.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbCity.FormattingEnabled = true;
-            this.cmbCity.Location = new System.Drawing.Point(120, 39);
+            this.cmbCity.Location = new System.Drawing.Point(120, 41);
             this.cmbCity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cmbCity.Name = "cmbCity";
             this.cmbCity.Size = new System.Drawing.Size(286, 24);
@@ -226,7 +226,7 @@
             this.cmbTown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbTown.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.cmbTown.FormattingEnabled = true;
-            this.cmbTown.Location = new System.Drawing.Point(120, 73);
+            this.cmbTown.Location = new System.Drawing.Point(120, 75);
             this.cmbTown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cmbTown.Name = "cmbTown";
             this.cmbTown.Size = new System.Drawing.Size(335, 24);
Index: branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVehicleCalendar.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVehicleCalendar.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVehicleCalendar.cs	(revision 358)
@@ -71,6 +71,11 @@
         /// å‡¦ç�†æœˆ
         /// </summary>
         private int m_ToMounth = 0;
+
+        /// <summary>
+        /// ç›´æŽ¥èµ·å‹•ãƒ•ãƒ©ã‚°
+        /// </summary>
+        private bool m_DirectFlg = false;
         #endregion
 
         #region ãƒ—ãƒ­ãƒ‘ãƒ†ã‚£
@@ -90,6 +95,15 @@
             get { return m_ToMounth; }
             set { m_ToMounth = value; }
         }
+
+        /// <summary>
+        /// ç›´æŽ¥èµ·å‹•ãƒ•ãƒ©ã‚°
+        /// </summary>
+        public bool DirectFlg
+        {
+            get { return m_DirectFlg; }
+            set { m_DirectFlg = value; }
+        }
         #endregion
 
         #region ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
@@ -101,8 +115,24 @@
             InitializeComponent();
         }
         #endregion
+        #region ãƒ‡ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// <summary>
+        /// ãƒ‡ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+        /// </summary>
+        ~FrmVehicleCalendar()
+        {
+            try
+            {
+                GC.Collect();
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
+        }
+        #endregion
 
-        #region ã‚¤ãƒ™ãƒ³ãƒˆãƒ¡ã‚½ãƒƒãƒ‰
+        #region ç”»é�¢ãƒ­ãƒ¼ãƒ‰
         /// <summary>
         /// ç”»é�¢ãƒ­ãƒ¼ãƒ‰
         /// </summary>
@@ -110,17 +140,40 @@
         /// <param name="e"></param>
         private void FrmActionCalendar_Load(object sender, EventArgs e)
         {
-            // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆ�æœŸè¡¨ç¤º
-            InitActionSchduleCombBox();
-            // åˆ�æœŸåŒ–
-            InitCreatePage();
-            // ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼è¡¨ç¤º
-            DisplayCalender();
+            try
+            {
+                // è»Šä¸¡é�¸æŠžç”»é�¢èµ·å‹•
+                if (!m_DirectFlg)
+                {
+                    // è»Šä¸¡é�¸æŠžç”»é�¢èµ·å‹•
+                    if (!VehicleCodeSelector(ref m_SelectVehicleCode))
+                    {   // é�¸æŠžç”»é�¢ã‚ˆã‚Šçµ‚äº†æ™‚
+                        m_DirectFlg = true;
+                        this.Close();
+                        return;
+                    }
+                }
 
-            m_bChengeAns = false;
-            m_bInit = false;
+                // ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆ�æœŸè¡¨ç¤º
+                InitActionSchduleCombBox();
+                
+                // åˆ�æœŸåŒ–
+                InitCreatePage();
+
+                // ã‚«ãƒ¬ãƒ³ãƒ€ãƒ¼è¡¨ç¤º
+                DisplayCalender();
+
+                m_bChengeAns = false;
+                m_bInit = false;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+            }
         }
+        #endregion
 
+        #region Ã—ãƒœã‚¿ãƒ³æŠ¼ä¸‹
         /// <summary>
         /// Ã—ãƒœã‚¿ãƒ³æŠ¼ä¸‹
         /// </summary>
@@ -138,8 +191,11 @@
                 }
             }
             // å‰�ãƒ—ãƒ­ã‚»ã‚¹ã�«æˆ»ã‚‹
-            ClsExcute.BackProcess();
+            if (m_DirectFlg) ClsExcute.BackProcess();
         }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
         /// <summary>
         /// ãƒ‡ãƒ¼ã‚¿ç™»éŒ²
         /// </summary>
@@ -178,6 +234,9 @@
                 vsdDB.close(); vsdDB = null;
             }
         }
+        #endregion
+
+        #region ãƒ‡ãƒ¼ã‚¿å‰Šé™¤
         /// <summary>
         /// ãƒ‡ãƒ¼ã‚¿å‰Šé™¤
         /// </summary>
@@ -212,6 +271,9 @@
                 asdDB.close(); asdDB = null;
             }
         }
+        #endregion
+
+        #region çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
         /// <summary>
         /// çµ‚äº†ãƒœã‚¿ãƒ³æŠ¼ä¸‹
         /// </summary>
@@ -221,6 +283,9 @@
         {
             this.Close();
         }
+        #endregion
+
+        #region è»Šä¸¡äºˆç´„ä¸€è¦§å¹´
         /// <summary>
         /// è»Šä¸¡äºˆç´„ä¸€è¦§å¹´
         /// </summary>
@@ -232,6 +297,9 @@
             //ã€€è»Šä¸¡äºˆç´„ä¸€è¦§è¡¨ç¤º
             if (cmbActionMonth.Text.Length != 0) DisplayCalender();
         }
+        #endregion
+
+        #region è»Šä¸¡äºˆç´„ä¸€è¦§æœˆ
         /// <summary>
         /// è»Šä¸¡äºˆç´„ä¸€è¦§æœˆ
         /// </summary>
@@ -243,6 +311,9 @@
             //ã€€è»Šä¸¡äºˆç´„ä¸€è¦§è¡¨ç¤º
             if (cmbActionYear.Text.Length != 0) DisplayCalender();
         }
+        #endregion
+
+        #region è»Šä¸¡äºˆç´„ãƒ€ãƒ–ãƒ«ã‚¯ãƒªãƒƒã‚¯å‡¦ç�†
         /// <summary>
         /// è»Šä¸¡äºˆç´„ãƒ€ãƒ–ãƒ«ã‚¯ãƒªãƒƒã‚¯å‡¦ç�†
         /// </summary>
@@ -1014,5 +1085,37 @@
             }
         }
         #endregion
+
+        #region è»Šä¸¡é�¸æŠžç”»é�¢èµ·å‹•
+        /// <summary>
+        /// è»Šä¸¡é�¸æŠžç”»é�¢èµ·å‹•
+        /// </summary>
+        /// <param name="VehicleCode"></param>
+        /// <returns></returns>
+        private bool VehicleCodeSelector(ref int VehicleCode)
+        {
+            FrmVehicleSelector frm = new FrmVehicleSelector();
+
+            try
+            {
+                frm.ShowDialog();
+                if (frm.EndButton == DialogResult.Cancel) return false;
+
+                VehicleCode = frm.VehicleCode;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorFormat("ã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼ï¼š{0}ï¼š{1}", CommonMotions.GetMethodName(), ex.Message);
+                return false;
+            }
+            finally
+            {
+                frm.Dispose(); frm = null;
+            }
+        }
+        #endregion
+
     }
 }
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs	(revision 358)
@@ -980,7 +980,7 @@
         {
             try
             {
-                // èµ·å‹•ãƒ�ã‚§ãƒƒã‚¯ã‚¯ãƒ©ã‚¹åˆ�æœŸåŒ–
+                // èµ·å‹•ãƒ�ã‚§ãƒƒã‚¯ã‚¯ãƒ©ã‚¹åˆ�æœŸåŒ–ï¼ˆæœŸé™�ãƒžã‚¹ã‚¿å�–å¾—ã�®ã�Ÿã‚�ï¼‰
                 m_CheckProc = new ClsSystemOnceExecute();
 
                 // ---- åˆ�å›žèµ·å‹•ãƒ�ã‚§ãƒƒã‚¯(æ¯Žæ—¥æœ€åˆ�ã�«èµ·å‹•ã�™ã‚‹äººã�Œãƒ‡ãƒ¼ã‚¿ãƒ�ã‚§ãƒƒã‚¯ã�™ã‚‹)
@@ -1627,8 +1627,9 @@
                 // ----- èµ·å‹•ãƒ—ãƒ­ã‚»ã‚¹è¨­å®š
                 NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule);
 
-                // ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
-                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode);
+                // ----- ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚»ãƒƒãƒˆ
+                // ç›´æŽ¥èµ·å‹•ãƒ•ãƒ©ã‚°ã‚»ãƒƒãƒˆ
+                ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true);
                 // å‡¦ç�†æœˆå�–å¾—
                 int iMounth = 0;
                 int CurrentColumn = dgv.CurrentCell.ColumnIndex;
@@ -1639,6 +1640,8 @@
                 }
                 if (iMounth == 0) iMounth = DateTime.Now.Month;
                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iMounth);
+                // é�¸æŠžè»Šä¸¡ã‚³ãƒ¼ãƒ‰ã‚»ãƒƒãƒˆ
+                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode);
 
                 // å‡¦ç�†å®Ÿè¡Œ
                 ClsExcute.ProcesscExecute();
Index: branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs	(revision 358)
@@ -236,17 +236,14 @@
                                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.LoginUserData.PersonCode);
                                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month);
                                 break;
-                                #endregion
+                            #endregion
                             case 3:
                                 #region è»Šä¸¡äºˆç´„å…¥åŠ›
-                                int VehicleCode = 0;
-                                if (VehicleCodeSelector(ref VehicleCode))
-                                {
-                                    // è»Šä¸¡äºˆç´„å…¥åŠ›
-                                    NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule);
-                                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode);
-                                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month);
-                                }
+                                // è»Šä¸¡äºˆç´„å…¥åŠ›
+                                NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule);
+                                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month);
+                                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0);    // Dummy
+                                ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
                                 break;
                                 #endregion
                             case 5:
@@ -652,17 +649,14 @@
                                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.LoginUserData.PersonCode);
                                 ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month);
                                 break;
-                                #endregion
+                            #endregion
                             case 3:
                                 #region è»Šä¸¡äºˆç´„å…¥åŠ›
-                                int VehicleCode = 0;
-                                if (VehicleCodeSelector(ref VehicleCode))
-                                {
-                                    // è»Šä¸¡äºˆç´„å…¥åŠ›
-                                    NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule);
-                                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode);
-                                    ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month);
-                                }
+                                // è»Šä¸¡äºˆç´„å…¥åŠ›
+                                NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule);
+                                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month);
+                                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0);    // Dummy
+                                ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false);
                                 break;
                                 #endregion
                             case 5:
Index: branches/src/ProcessManagement/ProcessManagement/Program.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Program.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Program.cs	(revision 358)
@@ -42,7 +42,7 @@
                 Application.SetCompatibleTextRenderingDefault(false);
 
                 // å…±é€šã‚¯ãƒ©ã‚¹åˆ�æœŸåŒ–
-                CommonMotions.Initialize();
+                if (!CommonMotions.Initialize()) return;
 
                 //// ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ãƒ�ã‚§ãƒƒã‚¯
                 //if (!ClsUpDate.ProgramTimeStampCheck())
Index: branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
===================================================================
--- branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 357)
+++ branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs	(revision 358)
@@ -32,7 +32,7 @@
 // ã�™ã�¹ã�¦ã�®å€¤ã‚’æŒ‡å®šã�™ã‚‹ã�‹ã€�ä¸‹ã�®ã‚ˆã�†ã�« '*' ã‚’ä½¿ã�£ã�¦ãƒ“ãƒ«ãƒ‰ã�Šã‚ˆã�³ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå�·ã‚’ 
 // æ—¢å®šå€¤ã�«ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.208")]
-[assembly: AssemblyFileVersion("1.0.1.208")]
+[assembly: AssemblyVersion("1.0.1.210")]
+[assembly: AssemblyFileVersion("1.0.1.210")]
 // Log4netã‚’ä½¿ç”¨ã�™ã‚‹
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]
\ No newline at end of file
