From 7321ab3d0115f0ef26a2841cb8e1bfd3e9e2273a Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Tue, 10 Feb 2015 23:27:24 +0700
Subject: [PATCH] menu

---
 netforce_clinic/actions/clinic_matching_hdcase.xml     | 2 +-
 netforce_clinic/actions/clinic_matching_hdcase_acc.xml | 8 ++++++++
 netforce_clinic/layouts/clinic_account_menu.xml        | 3 ++-
 netforce_clinic/layouts/clinic_menu.xml                | 4 +---
 netforce_clinic/models/matching_hdcase.py              | 2 +-
 netforce_clinic/templates/clinic_page.hbs              | 6 +++---
 6 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_matching_hdcase_acc.xml

diff --git a/netforce_clinic/actions/clinic_matching_hdcase.xml b/netforce_clinic/actions/clinic_matching_hdcase.xml
index a9961b2..13509ab 100644
--- a/netforce_clinic/actions/clinic_matching_hdcase.xml
+++ b/netforce_clinic/actions/clinic_matching_hdcase.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">Matching HDCase</field>
+    <field name="string">HD Cases Matching</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.matching.hdcase</field>
     <field name="report_template">matching_hdcase</field>                                                      
diff --git a/netforce_clinic/actions/clinic_matching_hdcase_acc.xml b/netforce_clinic/actions/clinic_matching_hdcase_acc.xml
new file mode 100644
index 0000000..a8f9999
--- /dev/null
+++ b/netforce_clinic/actions/clinic_matching_hdcase_acc.xml
@@ -0,0 +1,8 @@
+<action>                                                                                                         
+    <field name="string">HD Cases Matching</field>
+    <field name="view_cls">report</field>                                                                        
+    <field name="model">clinic.matching.hdcase</field>
+    <field name="report_template">matching_hdcase</field>                                                      
+    <field name="report_template_xls">matching_hdcase</field>                                                         
+    <field name="menu">account_menu</field>                                                                  
+</action>  
diff --git a/netforce_clinic/layouts/clinic_account_menu.xml b/netforce_clinic/layouts/clinic_account_menu.xml
index c5110a7..29a46f4 100644
--- a/netforce_clinic/layouts/clinic_account_menu.xml
+++ b/netforce_clinic/layouts/clinic_account_menu.xml
@@ -3,7 +3,8 @@
         <item string="Ratchawat">
             <item string="Labor Costs" action="clinic_labor_cost"/>
             <item string="Labor Cost Entries" action="clinic_labor_cost_entry"/>
-            <item string="Matching Payments" action="clinic_matching_payment"/>
+            <item string="Payments Matching" action="clinic_matching_payment"/>
+            <item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
             <item string="HD Case Expenses" action="clinic_hd_case_expense"/>
             <divider/>
             <header string="REPORTS"/>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index ba3ce02..fc615f1 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -44,11 +44,9 @@
     </item>
     <item string="HD Cases" perm="clinic_hdcase">
         <item string="HD Cases" action="clinic_hd_case"/>
+        <item string="HD Cases Matching" action="clinic_matching_hdcase"/>
         <item string="RD Shop" action="clinic_shop" perm="clinic_shop"/>
         <item string="Sickbed" action="clinic_sickbed"/>
-        <divider/>
-        <header string="OTHERS"/>
-        <item string="Matching HD Case" action="clinic_matching_hdcase"/>
     </item>
     <item string="Reporting" perm="clinic_report">
         <item string="Visit Summary" action="clinic_report_visit"/>
diff --git a/netforce_clinic/models/matching_hdcase.py b/netforce_clinic/models/matching_hdcase.py
index de91247..dd4132f 100644
--- a/netforce_clinic/models/matching_hdcase.py
+++ b/netforce_clinic/models/matching_hdcase.py
@@ -57,6 +57,7 @@ class MatchingHDCase(Model):
     def get_report_data(self,ids,context={}):
         hdcases={}
         date=time.strftime("%Y-%m-%d")
+        lines=[]
         if ids:
             obj=self.browse(ids)[0]
             date=obj.date
@@ -135,7 +136,6 @@ class MatchingHDCase(Model):
                         'note': '%s, %s, %s, %s, %s'%(date,hn,hct,prod_name,fee_amt),
                     }
 
-                lines=[]
                 for row in rows:
                     vals=list(row.values())
                     date,_time=(vals[5] or "").split()
diff --git a/netforce_clinic/templates/clinic_page.hbs b/netforce_clinic/templates/clinic_page.hbs
index e6e8353..f26dd0b 100644
--- a/netforce_clinic/templates/clinic_page.hbs
+++ b/netforce_clinic/templates/clinic_page.hbs
@@ -92,15 +92,15 @@
                 <div>
                     <a href="#name=clinic_hd_case">{{t "HD Cases"}}</a>
                 </div>
+                <div>
+                    <a href="#name=clinic_matching_hdcase">{{t "HD Cases Matching"}}</a>
+                </div>
                 <div>
                     <a href="#name=clinic_shop">{{t "RD Shop"}}</a>
                 </div>
                 <div>
                     <a href="#name=clinic_sickbed">{{t "Sickbed"}}</a>
                 </div>
-                <div>
-                    <a href="#name=clinic_matching_hdcase">{{t "Matching HD Cases"}}</a>
-                </div>
             </div>
         </div>
     </div>