From 02184b877b2f87d38860ad8fe11b0d0beb73c9cd Mon Sep 17 00:00:00 2001
From: SPP <songpon.p@gmail.com>
Date: Thu, 7 Jun 2018 17:11:34 +0700
Subject: [PATCH] merge hdcase summary report old -> new

---
 netforce_clinic/actions/report_hdcase_summary.xml   | 2 +-
 netforce_clinic/layouts/clinic_menu.xml             | 4 ++--
 netforce_clinic/templates/report_hdcase_summary.hbs | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/netforce_clinic/actions/report_hdcase_summary.xml b/netforce_clinic/actions/report_hdcase_summary.xml
index ea47eeb..bf64ca8 100644
--- a/netforce_clinic/actions/report_hdcase_summary.xml
+++ b/netforce_clinic/actions/report_hdcase_summary.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">HD Case Summary (New)</field>
+    <field name="string">HD Case Summary</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">report.hdcase.summary</field>
     <field name="report_template">report_hdcase_summary</field>                                                      
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index be6f368..f0cb24e 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -42,10 +42,10 @@
         <item string="Sickbed" action="clinic_sickbed"/>
     </item>
     <item string="Reports" perm="clinic_report">
-        <item string="HD Case Summary (new)" action="report_hdcase_summary"/>
+        <item string="HD Case Summary" action="report_hdcase_summary"/>
         <item string="Report Cycle Setting" action="clinic_report_cycle_setting"/>
         <item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
-        <item string="HD Case Summary (old)" action="clinic_report_hd_case_summary"/>
+        <!--<item string="HD Case Summary (old)" action="clinic_report_hd_case_summary"/>-->
         <item string="HD Case Expense" action="report_hdcase_expense_summary"/>
         <item string="RD Shop Expense" action="clinic_report_shop"/>
         <divider/>
diff --git a/netforce_clinic/templates/report_hdcase_summary.hbs b/netforce_clinic/templates/report_hdcase_summary.hbs
index 073279a..828f730 100644
--- a/netforce_clinic/templates/report_hdcase_summary.hbs
+++ b/netforce_clinic/templates/report_hdcase_summary.hbs
@@ -71,11 +71,13 @@
                                     {{view "link" string=name action="clinic_patient_move" action_options="mode=form" active_id=pid}}
                                 </td>
                                 <!--button delete ##TODO-->
+                                <!--
                                 <td>
                                     <button type="button" class="btn btn-danger btn-xs">
                                         <span class="glyphicon glyphicon-remove"></span>
                                     </button>
                                 </td>
+                                -->
                             </tr>
                         {{/each}}
                     {{else}}
@@ -107,11 +109,13 @@
                                     {{view "link" string=name action="clinic_patient_move" action_options="mode=form" active_id=pid}}
                                 </td>
                                 <!--button delete ##TODO-->
+                                <!--
                                 <td>
                                     <button type="button" class="btn btn-danger btn-xs">
                                         <span class="glyphicon glyphicon-remove"></span>
                                     </button>
                                 </td>
+                                -->
                             </tr>
                         {{/each}}
                     {{else}}