diff --git a/module/budget/control.php b/module/budget/control.php
index 2210bbc7ed..6e3ed57992 100644
--- a/module/budget/control.php
+++ b/module/budget/control.php
@@ -22,13 +22,13 @@ class budget extends control
     public function __construct($module = '', $method = '')
     {
         parent::__construct($module, $method);
-        $this->view->program = $this->loadModel('project')->getByID($this->session->PRJ);
+        $this->view->program = $this->loadModel('program')->getPRJByID($this->session->PRJ);
     }
 
     /**
      * The budget browse page.
      *
-     * @param  varchar $orderBy
+     * @param  string  $orderBy
      * @param  int     $recTotal
      * @param  int     $recPerPage
      * @param  int     $pageID
@@ -40,14 +40,16 @@ class budget extends control
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
-        $this->view->title      = $this->lang->budget->common . $this->lang->budget->list;
-        $this->view->position[] = $this->lang->budget->common . $this->lang->budget->list;
-        $this->view->budgets    = $this->budget->getList($this->session->PRJ, $orderBy, $pager);
-        $this->view->orderBy    = $orderBy;
-        $this->view->pager      = $pager;
-        $this->view->modules    = $this->loadModel('tree')->getOptionMenu(0, $viewType = 'subject', $startModuleID = 0);
-        $this->view->stages     = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
-        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->title      = $this->lang->budget->list . $this->lang->colon . $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->list;
+
+        $this->view->budgets = $this->budget->getList($this->session->PRJ, $orderBy, $pager);
+        $this->view->orderBy = $orderBy;
+        $this->view->pager   = $pager;
+        $this->view->modules = $this->loadModel('tree')->getOptionMenu(0, 'subject');
+        $this->view->stages  = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
+        $this->view->users   = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->display();
     }
 
@@ -59,29 +61,18 @@ class budget extends control
      */
     public function summary()
     {
-        $getSubjectStructure = $this->budget->getSubjectStructure();
-        $isChildren          = false;
-        if(is_array($getSubjectStructure))
-        {
-            foreach($getSubjectStructure as $subjects)
-            {
-                if(isset($subjects['hasChild']))
-                {
-                    $isChildren = true;
-                    break;
-                }
-            }
-        }
+        $subjects = $this->budget->getSubjectStructure();
+
+        $this->view->title      = $this->lang->budget->summary . $this->lang->colon . $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->summary;
+
+        $this->view->subjects   = $subjects;
+        $this->view->subSubject = $this->budget->getSubSubject($subjects);
+        $this->view->plans      = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
+        $this->view->summary    = $this->budget->getSummary($this->session->PRJ, $subjects);
+        $this->view->modules    = $this->loadModel('tree')->getOptionMenu(0, $viewType = 'subject', $startModuleID = 0);
 
-        $this->view->title            = $this->lang->budget->common . $this->lang->budget->summary;
-        $this->view->position[]       = $this->lang->budget->common . $this->lang->budget->summary;
-        $this->view->subjectStructure = $getSubjectStructure;
-        $this->view->isChildren       = $isChildren;
-        $this->view->subjects         = $this->budget->getSubjects($this->session->PRJ);
-        $this->view->stages           = $this->budget->getStages($this->session->PRJ);
-        $this->view->stagePairs       = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
-        $this->view->summary          = $this->budget->getSummary($this->session->PRJ);
-        $this->view->modules          = $this->loadModel('tree')->getOptionMenu(0, $viewType = 'subject', $startModuleID = 0);
         $this->display();
     }
 
@@ -96,32 +87,30 @@ class budget extends control
         if($_POST)
         {
             $budgetID = $this->budget->create();
-
             if(dao::isError())
             {
-                $response['result']  = 'fail';
-                $response['message'] = dao::getError();
+                $response = array('result' => 'fail', 'message' => dao::getError());
                 $this->send($response);
             }
 
             $this->loadModel('action')->create('budget', $budgetID, 'created');
-
-            $response['result']  = 'success';
-            $response['message'] = $this->lang->saveSuccess;
-            $response['locate']  = inlink('browse');
+            $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'));
             $this->send($response);
         }
 
-        $this->view->title      = $this->lang->budget->create . $this->lang->budget->common;
-        $this->view->position[] = $this->lang->budget->create . $this->lang->budget->common;
-        $this->view->subjects   = array(0 => '') + $this->budget->getSubjectOption();
-        $this->view->stages     = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
+        $this->view->title      = $this->lang->budget->create . $this->lang->colon . $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->create;
+
+        $this->view->subjects = array(0 => '') + $this->budget->getSubjectOption();
+        $this->view->plans    = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
         $this->display();
     }
 
     /**
      * Edit a budget.
      *
+     * @param  int    $budgetID
      * @access public
      * @return void
      */
@@ -130,11 +119,9 @@ class budget extends control
         if($_POST)
         {
             $changes = $this->budget->update($budgetID);
-
             if(dao::isError())
             {
-                $response['result']  = 'fail';
-                $response['message'] = dao::getError();
+                $response = array('result' => 'fail', 'message' => dao::getError());
                 $this->send($response);
             }
 
@@ -144,22 +131,22 @@ class budget extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $response['result']  = 'success';
-            $response['message'] = $this->lang->saveSuccess;
-            $response['locate']  = inlink('browse');
+            $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'));
             $this->send($response);
         }
 
-        $this->view->title      = $this->lang->budget->edit . $this->lang->budget->common;
-        $this->view->position[] = $this->lang->budget->edit . $this->lang->budget->common;
-        $this->view->subjects   = array('' => '') + $this->budget->getSubjectOption();
-        $this->view->stages     = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
-        $this->view->budget     = $this->budget->getByID($budgetID);
+        $this->view->title      = $this->lang->budget->edit . $this->lang->colon . $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->edit;
+
+        $this->view->subjects = array('' => '') + $this->budget->getSubjectOption();
+        $this->view->plans    = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
+        $this->view->budget   = $this->budget->getByID($budgetID);
         $this->display();
     }
 
     /**
-     * View a budget.
+     * Budget details.
      *
      * @param  int  $budgetID
      * @access public
@@ -167,12 +154,16 @@ class budget extends control
      */
     public function view($budgetID)
     {
-        $this->view->stages     = $this->budget->getStages($this->session->PRJ);
-        $this->view->subjects   = $this->budget->getSubjectOption();
-        $this->view->stages     = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
-        $this->view->budget     = $this->budget->getByID($budgetID);
-        $this->view->actions    = $this->loadModel('action')->getList('budget', $budgetID);
-        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->title      = $this->lang->budget->common . $this->lang->colon . $this->lang->budget->view;
+        $this->view->position[] = $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->view;
+
+        $this->view->subjects = $this->budget->getSubjectOption();
+        $this->view->plans    = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
+        $this->view->budget   = $this->budget->getByID($budgetID);
+        $this->view->actions  = $this->loadModel('action')->getList('budget', $budgetID);
+        $this->view->users    = $this->loadModel('user')->getPairs('noclosed|noletter');
+
         $this->display();
     }
 
@@ -188,15 +179,14 @@ class budget extends control
     {
         if($confirm == 'no')
         {
-            echo js::confirm($this->lang->budget->confirmDelete, $this->createLink('budget', 'delete', "id=$budgetID&confirm=yes"));
-            exit;
+            echo js::confirm($this->lang->budget->confirmDelete, inLink('delete', "budgetID=$budgetID&confirm=yes"));
+            die();
         }
         else
         {
             $this->budget->delete(TABLE_BUDGET, $budgetID);
             die(js::locate(inlink('browse'), 'parent'));
         }
-
     }
 
     /**
@@ -210,24 +200,22 @@ class budget extends control
         if($_POST)
         {
             $this->budget->batchCreate();
-
             if(dao::isError())
             {
-                $response['result']  = 'fail';
-                $response['message'] = dao::getError();
+                $response = array('result' => 'fail', 'message' => dao::getError());
                 $this->send($response);
             }
 
-            $response['result']  = 'success';
-            $response['message'] = $this->lang->saveSuccess;
-            $response['locate']  = inlink('browse');
+            $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'));
             $this->send($response);
         }
 
-        $this->view->title      = $this->lang->budget->batchCreate . $this->lang->budget->common;
-        $this->view->position[] = $this->lang->budget->batchCreate . $this->lang->budget->common;
-        $this->view->subjects   = array('' => '') + $this->budget->getSubjectOption();
-        $this->view->stages     = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
+        $this->view->title      = $this->lang->budget->batchCreate . $this->lang->colon . $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->common;
+        $this->view->position[] = $this->lang->budget->batchCreate;
+
+        $this->view->subjects = array('' => '') + $this->budget->getSubjectOption();
+        $this->view->plans    = $this->loadModel('programplan')->getPlanPairsForBudget($this->session->PRJ);
         $this->display();
     }
 }
diff --git a/module/budget/lang/de.php b/module/budget/lang/de.php
index ac06aeb504..79eb5f9b41 100644
--- a/module/budget/lang/de.php
+++ b/module/budget/lang/de.php
@@ -22,7 +22,6 @@ $lang->budget->createdDate    = 'CreatedDate';
 $lang->budget->lastEditedBy   = 'LastEditBy';
 $lang->budget->lastEditedDate = 'LastEditedDate';
 $lang->budget->basicInfo      = 'Basic Info.';
-$lang->budget->noData         = 'No Data';
 
 $lang->budget->summaryReport = 'Summary';
 $lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/en.php b/module/budget/lang/en.php
index ac06aeb504..79eb5f9b41 100644
--- a/module/budget/lang/en.php
+++ b/module/budget/lang/en.php
@@ -22,7 +22,6 @@ $lang->budget->createdDate    = 'CreatedDate';
 $lang->budget->lastEditedBy   = 'LastEditBy';
 $lang->budget->lastEditedDate = 'LastEditedDate';
 $lang->budget->basicInfo      = 'Basic Info.';
-$lang->budget->noData         = 'No Data';
 
 $lang->budget->summaryReport = 'Summary';
 $lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/fr.php b/module/budget/lang/fr.php
index ac06aeb504..79eb5f9b41 100644
--- a/module/budget/lang/fr.php
+++ b/module/budget/lang/fr.php
@@ -22,7 +22,6 @@ $lang->budget->createdDate    = 'CreatedDate';
 $lang->budget->lastEditedBy   = 'LastEditBy';
 $lang->budget->lastEditedDate = 'LastEditedDate';
 $lang->budget->basicInfo      = 'Basic Info.';
-$lang->budget->noData         = 'No Data';
 
 $lang->budget->summaryReport = 'Summary';
 $lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/vi.php b/module/budget/lang/vi.php
index ac06aeb504..79eb5f9b41 100644
--- a/module/budget/lang/vi.php
+++ b/module/budget/lang/vi.php
@@ -22,7 +22,6 @@ $lang->budget->createdDate    = 'CreatedDate';
 $lang->budget->lastEditedBy   = 'LastEditBy';
 $lang->budget->lastEditedDate = 'LastEditedDate';
 $lang->budget->basicInfo      = 'Basic Info.';
-$lang->budget->noData         = 'No Data';
 
 $lang->budget->summaryReport = 'Summary';
 $lang->budget->confirmDelete = 'Do you want to delete it?';
diff --git a/module/budget/lang/zh-cn.php b/module/budget/lang/zh-cn.php
index a40a73b968..6fda6b7841 100644
--- a/module/budget/lang/zh-cn.php
+++ b/module/budget/lang/zh-cn.php
@@ -22,7 +22,6 @@ $lang->budget->createdDate    = '创建时间';
 $lang->budget->lastEditedBy   = '由谁编辑';
 $lang->budget->lastEditedDate = '编辑时间';
 $lang->budget->basicInfo      = '基本信息';
-$lang->budget->noData         = '暂无记录，';
 
 $lang->budget->summaryReport = '汇总表';
 $lang->budget->confirmDelete = '您确定要删除吗？';
diff --git a/module/budget/lang/zh-tw.php b/module/budget/lang/zh-tw.php
index 5866325f42..639265369f 100644
--- a/module/budget/lang/zh-tw.php
+++ b/module/budget/lang/zh-tw.php
@@ -22,7 +22,6 @@ $lang->budget->createdDate    = '創建時間';
 $lang->budget->lastEditedBy   = '由誰編輯';
 $lang->budget->lastEditedDate = '編輯時間';
 $lang->budget->basicInfo      = '基本信息';
-$lang->budget->noData         = '暫無記錄，';
 
 $lang->budget->summaryReport = '彙總表';
 $lang->budget->confirmDelete = '您確定要刪除嗎？';
diff --git a/module/budget/model.php b/module/budget/model.php
index 8cf7ca2fc4..1b2572a5a5 100644
--- a/module/budget/model.php
+++ b/module/budget/model.php
@@ -51,52 +51,39 @@ class budgetModel extends model
     /**
      * Get budget list.
      *
-     * @param  int     $programID
-     * @param  varchar $orderBy
-     * @param  pager   $object
+     * @param  int    $projectID
+     * @param  string $orderBy
+     * @param  object $pager
      * @access public
      * @return object
      */
-    public function getList($programID, $orderBy = 'id_desc', $pager = null)
+    public function getList($projectID, $orderBy = 'id_desc', $pager = null)
     {
-        return $this->dao->select('*')->from(TABLE_BUDGET)
-            ->where('PRJ')->eq($programID)
-            ->andWhere('deleted')->eq(0)
-            ->orderBy($orderBy)
-            ->page($pager)
-            ->fetchAll();
+        return $this->dao->select('*')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->orderBy($orderBy)->page($pager)->fetchAll();
     }
 
     /**
      * Get stages.
      *
-     * @param  int    $programID
+     * @param  int    $projectID
      * @access public
      * @return array
      */
-    public function getStages($programID)
+    public function getStages($projectID)
     {
-        return $this->dao->select('stage')->from(TABLE_BUDGET)
-            ->where('PRJ')->eq($programID)
-            ->andWhere('deleted')->eq(0)
-            ->orderBy('stage_asc')
-            ->fetchPairs();
+        return $this->dao->select('stage')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->orderBy('stage_asc')->fetchPairs();
     }
 
     /**
      * Get subjects.
      *
-     * @param  int    $programID
+     * @param  int    $projectID
      * @access public
      * @return array
      */
-    public function getSubjects($programID)
+    public function getSubjects($projectID)
     {
-        return $this->dao->select('subject')->from(TABLE_BUDGET)
-            ->where('PRJ')->eq($programID)
-            ->andWhere('deleted')->eq(0)
-            ->orderBy('subject_asc')
-            ->fetchPairs();
+        return $this->dao->select('subject')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->orderBy('subject_asc')->fetchPairs();
     }
 
     /**
@@ -107,59 +94,75 @@ class budgetModel extends model
      */
     public function getSubjectStructure()
     {
-        $subjects  = $this->getSubjects($this->session->PRJ);
+        $this->loadModel('tree');
 
         $structure = array();
+        $subjects  = $this->getSubjects($this->session->PRJ);
         foreach($subjects as $subjectID)
         {
-            $subject = $this->loadModel('tree')->getById($subjectID); 
-            if($subject->grade == 1) 
+            $subject = $this->tree->getById($subjectID);
+            if($subject->grade == 1)
             {
                 $structure[$subject->id][] = $subject->id;
                 continue;
             }
-            
-            $structure[$subject->parent][]           = $subject->id;
-            $structure[$subject->parent]['hasChild'] = true;
+
+            $structure[$subject->parent][] = $subject->id;
         }
 
         return $structure;
     }
 
+    /**
+     * Existence of sub-subjects.
+     *
+     * @param  array  $subjects
+     * @access public
+     * @return bool
+     */
+    public function getSubSubject($subjects)
+    {
+        foreach($subjects as $id => $subject)
+        {
+            if($subject[0] != $id) return true;
+        }
+
+        return false;
+    }
+
     /**
      * Get summary.
      *
-     * @param  int    $programID
+     * @param  int    $projectID
+     * @param  array  $subjects
      * @access public
      * @return array
      */
-    public function getSummary($programID)
+    public function getSummary($projectID, $subjects)
     {
-        $budgets = $this->dao->select('*')->from(TABLE_BUDGET)
-            ->where('PRJ')->eq($programID)
-            ->andWhere('deleted')->eq(0)
-            ->fetchAll();
+        $budgets = $this->dao->select('*')->from(TABLE_BUDGET)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->fetchAll();
+        $stages  = $this->getStages($this->session->PRJ);
 
-        $summary = array();
-        foreach($budgets as $budget)
+        $summary['stages']   = array();
+        $summary['subjects'] = array();
+        foreach($stages as $stage)
         {
-            $summary[$budget->subject] = isset($summary[$budget->subject]) ? $summary[$budget->subject] : array();
-            $summary[$budget->subject][$budget->stage]  = isset($summary[$budget->subject][$budget->stage]) ? $summary[$budget->subject][$budget->stage] : 0;
-            $summary[$budget->subject][$budget->stage] += $budget->amount;
-        }
-
-        $total = 0;
-        foreach($summary as $subject => $stageSummary)
-        {
-            $summary[$subject]['summary'] = 0;
-            foreach($stageSummary as $amount) 
+            foreach($subjects as $subject)
             {
-                $summary[$subject]['summary'] += $amount;
-                $total += $amount;
+                foreach($subject as $children)
+                {
+                    $summary['stages'][$stage][$children] = 0;
+                    $summary['subjects'][$children]       = 0;
+                }
             }
         }
 
-        $summary['total'] = $total;
+        foreach($budgets as $budget)
+        {
+            $summary['stages'][$budget->stage][$budget->subject] = $budget->amount;
+            $summary['subjects'][$budget->subject] += $budget->amount;
+        }
+
         return $summary;
     }
 
diff --git a/module/budget/view/batchcreate.html.php b/module/budget/view/batchcreate.html.php
index 953cc74454..29031dba60 100644
--- a/module/budget/view/batchcreate.html.php
+++ b/module/budget/view/batchcreate.html.php
@@ -33,7 +33,7 @@
         <?php for($i = 1; $i <= 10; $i++):?>
           <tr>
             <td><?php echo $i;?></td>
-            <td><?php echo html::select("stage[$i]", $stages, '', 'class="form-control chosen"');?></td>
+            <td><?php echo html::select("stage[$i]", $plans, '', 'class="form-control chosen"');?></td>
             <td><?php echo html::select("subject[$i]", $subjects, '', 'class="form-control chosen"');?></td>
             <td><?php echo html::input("name[$i]", '', 'class="form-control"');?></td>
             <td>
diff --git a/module/budget/view/browse.html.php b/module/budget/view/browse.html.php
index 05a5fd624e..697939f0d6 100644
--- a/module/budget/view/browse.html.php
+++ b/module/budget/view/browse.html.php
@@ -29,7 +29,7 @@
     <?php if(empty($budgets)):?>
     <div class="table-empty-tip">
       <p> 
-        <span class="text-muted"><?php echo $lang->budget->noData;?></span>
+        <span class="text-muted"><?php echo $lang->noData;?></span>
         <?php if(common::hasPriv('budget', 'create')):?>
         <?php echo html::a($this->createLink('budget', 'create', ''), "<i class='icon icon-plus'></i> " . $lang->budget->create, '', "class='btn btn-info'");?>
         <?php endif;?>
diff --git a/module/budget/view/create.html.php b/module/budget/view/create.html.php
index b5404e9fd5..bff010a02c 100644
--- a/module/budget/view/create.html.php
+++ b/module/budget/view/create.html.php
@@ -22,7 +22,7 @@
         <tbody>
           <tr>
             <th class='w-120px'><?php echo $lang->budget->stage;?> </th>
-            <td><?php echo html::select('stage', $stages, '', 'class="form-control chosen"');?></td>
+            <td><?php echo html::select('stage', $plans, '', 'class="form-control chosen"');?></td>
             <td></td>
             <td></td>
           </tr>
diff --git a/module/budget/view/edit.html.php b/module/budget/view/edit.html.php
index 7fef9c795a..ac62ce48d5 100644
--- a/module/budget/view/edit.html.php
+++ b/module/budget/view/edit.html.php
@@ -17,42 +17,42 @@
     <div class="main-header">
       <h2><?php echo $lang->budget->edit . $lang->budget->common;?></h2>
     </div>
+    <form class="main-form form-ajax" method='post' enctype='multipart/form-data'>
+      <table class="table table-form">
+        <tbody>
+          <tr>
+            <th class='w-120px'><?php echo $lang->budget->stage;?> </th>
+            <td><?php echo html::select('stage', $plans, $budget->stage, 'class="form-control chosen"');?></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->budget->subject;?> </th>
+            <td><?php echo html::select('subject', $subjects, $budget->subject, 'class="form-control chosen"');?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->budget->amount;?> </th>
+            <td>
+              <div class='input-group'>
+              <?php echo html::input('amount', $budget->amount, 'class="form-control"');?>
+              <span class='input-group-addon'><?php echo $lang->budget->{$program->budgetUnit};?></span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->budget->name;?> </th>
+            <td colspan='2'><?php echo html::input('name', $budget->name, 'class="form-control"');?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->budget->desc;?> </th>
+            <td colspan='2'><?php echo html::textarea('desc', $budget->desc, 'class="form-control"');?></td>
+          </tr>
+          <tr>
+            <td colspan='4' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
+          </tr>
+        </tbody>
+      </table>
+    </form>
   </div>
-  <form class="main-form form-ajax" method='post' enctype='multipart/form-data'>
-    <table class="table table-form">
-      <tbody>
-        <tr>
-          <th class='w-120px'><?php echo $lang->budget->stage;?> </th>
-          <td><?php echo html::select('stage', $stages, $budget->stage, 'class="form-control chosen"');?></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->budget->subject;?> </th>
-          <td><?php echo html::select('subject', $subjects, $budget->subject, 'class="form-control chosen"');?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->budget->amount;?> </th>
-          <td>
-            <div class='input-group'>
-            <?php echo html::input('amount', $budget->amount, 'class="form-control"');?>
-            <span class='input-group-addon'><?php echo $lang->budget->{$program->budgetUnit};?></span>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->budget->name;?> </th>
-          <td colspan='2'><?php echo html::input('name', $budget->name, 'class="form-control"');?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->budget->desc;?> </th>
-          <td colspan='2'><?php echo html::textarea('desc', $budget->desc, 'class="form-control"');?></td>
-        </tr>
-        <tr>
-          <td colspan='4' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
-        </tr>
-      </tbody>
-    </table>
-  </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/budget/view/summary.html.php b/module/budget/view/summary.html.php
index 64678a9639..6934d329a8 100644
--- a/module/budget/view/summary.html.php
+++ b/module/budget/view/summary.html.php
@@ -29,70 +29,47 @@
 </div>
 <div id='mainContent' class='main-content'>
   <div class="center-block">
-    <?php if($summary['total'] != 0):?>
+    <?php if(!empty($subjects)):?>
     <table class='table table-bordered'>
       <tr class='text-center table-title'>
-        <th rowspan="<?php echo $isChildren ?  2 : 1;?>"><?php echo $lang->budget->subject . '/' . $lang->budget->stage?></th>
-        <?php $hasChild = false;?>
-        <?php foreach($subjectStructure as $subject => $structure):?>
-        <?php if(isset($structure['hasChild'])) $hasChild = true;?>
-        <th colspan="<?php echo (count($structure) - 1)?>"><?php echo zget($modules, $subject);?></th>
+        <th rowspan="<?php echo $subSubject ? 2 : 1;?>"><?php echo $lang->budget->subject . '/' . $lang->budget->stage;?></th>
+        <?php foreach($subjects as $id => $subject):?>
+          <th colspan="<?php echo count($subject);?>"><?php echo zget($modules, $id);?></th>
         <?php endforeach;?>
-        <th rowspan="<?php echo $isChildren ? 2 : 1;?>"><?php echo $lang->budget->summary; ?></th>
+        <th rowspan="<?php echo $subSubject ? 2 : 1;?>"><?php echo $lang->budget->summary;?></th>
       </tr>
-      <?php if($hasChild):?>
       <tr class='text-center table-title'>
-        <?php foreach($subjectStructure as $parentID => $structure):?>
-        <?php
-        foreach($structure as $subject)
-        {
-            if($subject == 'hasChild') continue;
-            if($subject == $parentID)
-            {
-                echo "<th></th>";
-            }
-            else
-            {
-                echo "<th>" . zget($modules, $subject) . "</th>";
-            }
-        }
-        ?>
+        <?php foreach($subjects as $subject):?>
+          <?php if($id == $subject[0] && !$subSubject) continue;?>
+          <?php foreach($subject as $subjectID):?>
+            <th><?php echo zget($modules, $subjectID);?></th>
+          <?php endforeach;?>
         <?php endforeach;?>
       </tr>
-      <?php endif;?>
-      <?php foreach($stages as $stage):?>
+
+      <?php foreach($summary['stages'] as $stageID => $subject):?>
       <tr>
-        <td><?php echo zget($stagePairs, $stage);?></td>
-        <?php foreach($subjects as $subject):?>
-        <td><?php echo isset($summary[$subject][$stage]) ? $summary[$subject][$stage] : 0;?></td>
+        <td><?php echo zget($plans, $stageID, $stageID);?></td>
+        <?php foreach($subject as $cost):?>
+          <td><?php echo $cost;?></td>
         <?php endforeach;?>
-        <td>
-        <?php $rowsum = 0;?>
-        <?php foreach($subjects as $subject):?>
-        <?php $rowsum += isset($summary[$subject][$stage]) ? $summary[$subject][$stage] : 0;?>
-        <?php endforeach;?>
-        <?php echo $rowsum;?>
-        </td>
+        <td><?php echo array_sum($subject);?></td>
       </tr>
       <?php endforeach;?>
+
       <tr class='summary'>
         <td><?php echo $lang->budget->summary;?></td>
-        <?php foreach($subjects as $subject):?>
-        <td><?php echo isset($summary[$subject]['summary']) ? $summary[$subject]['summary'] : 0;?></td>
+        <?php foreach($summary['subjects'] as $cost):?>
+          <td><?php echo $cost;?></td>
         <?php endforeach;?>
-        <td>
-        <?php $rowsum = 0;?>
-        <?php foreach($subjects as $subject):?>
-        <?php $rowsum += isset($summary[$subject]['summary']) ? $summary[$subject]['summary'] : 0;?>
-        <?php endforeach;?>
-        <?php echo $rowsum;?>
         </td>
+        <td><?php echo array_sum($summary['subjects']);?></td>
       </tr>
     </table>
-      <div class='alert alert-info mg-0'><?php echo $lang->budget->total . '：' . $summary['total'] . $lang->budget->{$program->budgetUnit};?></div>
+    <div class='alert alert-info mg-0'><?php echo $lang->budget->total . '：' . array_sum($summary['subjects']) . $lang->budget->{$program->budgetUnit};?></div>
     <?php else:?>
     <div class="table-empty-tip">
-      <p> 
+      <p>
         <span class="text-muted"><?php echo $lang->noData;?></span>
       </p>
     </div>
diff --git a/module/budget/view/view.html.php b/module/budget/view/view.html.php
index 1772323154..93bf99eaa1 100644
--- a/module/budget/view/view.html.php
+++ b/module/budget/view/view.html.php
@@ -42,7 +42,7 @@
           <tbody>
             <tr>
               <th><?php echo $lang->budget->stage;?></th>
-              <td><?php echo zget($stages, $budget->stage);?></td>
+              <td><?php echo zget($plans, $budget->stage);?></td>
             </tr>
             <tr>
               <th><?php echo $lang->budget->subject;?></th>
diff --git a/module/holiday/control.php b/module/holiday/control.php
index 24a3aa04a2..e1e15ae6c5 100644
--- a/module/holiday/control.php
+++ b/module/holiday/control.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * The control file of holiday of Ranzhi.
+ * The control file of holiday module of ZenTaoPMS.
  *
- * @copyright   Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      chujilu <chujilu@cnezsoft.com>
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     holiday
- * @version     $Id$
- * @link        http://www.ranzhi.org
+ * @version     $Id
+ * @link        http://www.zentao.net
  */
 class holiday extends control
 {
diff --git a/module/holiday/model.php b/module/holiday/model.php
index bd62164736..92e2cd6462 100644
--- a/module/holiday/model.php
+++ b/module/holiday/model.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * The model file of holiday module of ranzhi.
+ * The model file of holiday module of ZenTaoPMS.
  *
- * @copyright   Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      chujilu <chujilu@cnezsoft.com>
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     holiday
- * @version     $Id$
- * @link        http://www.ranzhi.org
+ * @version     $Id
+ * @link        http://www.zentao.net
  */
 class holidayModel extends model
 {
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 49658b005c..ea6e9f71e0 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -94,23 +94,7 @@ class programplanModel extends model
      */
     public function getPlanPairsForBudget($programID = 0)
     {
-        $pairs   = array();
-        $plans   = $this->getPlans($programID);
-        $program = $this->getByID($programID);
-        foreach($plans as $planID => $plan)
-        {
-            $name = $plan->name;
-            if($program->product == 'multiple') $name = $plan->productName . '/' . $name;
-            $pairs[$planID] = '/'.$name;
-
-            foreach($plan->children as $childID => $child)
-            {
-                $childName = $name . '/' . $child->name;
-                $pairs[$childID] = $childName;
-            }
-        }
-
-        return $pairs;
+        return $this->loadModel('project')->getExecutionsByProject($programID, 'all', 0, true);
     }
 
     /**