From 5387c9029e39ae312f598b396ba39ea58ae510bb Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Thu, 2 Apr 2015 13:39:34 +0700
Subject: [PATCH] change layout

---
 .../clinic_report_account_hd_case_summary.xml      |  2 +-
 .../actions/clinic_report_account_shop.xml         |  2 +-
 netforce_clinic/actions/clinic_report_claim.xml    |  2 +-
 netforce_clinic/actions/clinic_report_shop.xml     |  2 +-
 netforce_clinic/layouts/clinic_account_menu.xml    |  4 ++--
 netforce_clinic/layouts/clinic_menu.xml            |  4 ++--
 netforce_clinic/models/report_hd_case_summary.py   | 10 +++++++++-
 .../templates/report_hd_case_summary.hbs           |  6 +++---
 netforce_clinic/templates/report_shop.hbs          | 14 +++++++++-----
 9 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml b/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
index 67fa412..875e713 100644
--- a/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
+++ b/netforce_clinic/actions/clinic_report_account_hd_case_summary.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">Report Claim Expense</field>
+    <field name="string">HD Case Expense</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.report.account.hd.case.summary</field>
     <field name="report_template">report_account_hd_case_summary</field>                                                      
diff --git a/netforce_clinic/actions/clinic_report_account_shop.xml b/netforce_clinic/actions/clinic_report_account_shop.xml
index dd48fe1..0cb0268 100644
--- a/netforce_clinic/actions/clinic_report_account_shop.xml
+++ b/netforce_clinic/actions/clinic_report_account_shop.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">Report Shop</field>
+    <field name="string">RD Shop Expense</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.report.shop</field>
     <field name="report_template">report_shop</field>                                                      
diff --git a/netforce_clinic/actions/clinic_report_claim.xml b/netforce_clinic/actions/clinic_report_claim.xml
index be5c742..2d01001 100644
--- a/netforce_clinic/actions/clinic_report_claim.xml
+++ b/netforce_clinic/actions/clinic_report_claim.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">Report Claim Expense</field>
+    <field name="string">HD Case Expense</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.report.account.hd.case.summary</field>
     <field name="report_template">report_account_hd_case_summary</field>                                                      
diff --git a/netforce_clinic/actions/clinic_report_shop.xml b/netforce_clinic/actions/clinic_report_shop.xml
index f831b6a..883ffcb 100644
--- a/netforce_clinic/actions/clinic_report_shop.xml
+++ b/netforce_clinic/actions/clinic_report_shop.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">Report Shop</field>
+    <field name="string">RD Shop Expense</field>
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.report.shop</field>
     <field name="report_template">report_shop</field>                                                      
diff --git a/netforce_clinic/layouts/clinic_account_menu.xml b/netforce_clinic/layouts/clinic_account_menu.xml
index f6558c2..ed7f59e 100644
--- a/netforce_clinic/layouts/clinic_account_menu.xml
+++ b/netforce_clinic/layouts/clinic_account_menu.xml
@@ -7,8 +7,8 @@
             <item string="HD Cases Matching" action="clinic_matching_hdcase_acc"/>
             <divider/>
             <header string="REPORTS"/>
-            <item string="Report Claim Expense" action="clinic_report_account_hd_case_summary"/>
-            <item string="Report RD Shop" action="clinic_report_account_shop"/>
+            <item string="HD Case Expense" action="clinic_report_account_hd_case_summary"/>
+            <item string="RD Shop Expense" action="clinic_report_account_shop"/>
             <item string="Labor Cost Summary" action="clinic_report_labor_cost_summary"/>
             <!--<item string="Labor Cost Detail" action="clinic_report_labor_cost_detail"/>-->
             <!--<item string="Labor Cost Sub Detail" action="clinic_report_labor_cost_sub_detail"/>-->
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 3486a56..fa4e6cc 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -45,8 +45,8 @@
         <item string="Sickbed" action="clinic_sickbed"/>
     </item>
     <item string="Reporting" perm="clinic_report">
-        <item string="Claim Expense" action="clinic_report_claim"/>
-        <item string="RD Shop Summary" action="clinic_report_shop"/>
+        <item string="HD Case Expense" action="clinic_report_claim"/>
+        <item string="RD Shop Expense" action="clinic_report_shop"/>
         <item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
         <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
         <!--<item string="Medical Detail" action="clinic_report_medical_detail"/>-->
diff --git a/netforce_clinic/models/report_hd_case_summary.py b/netforce_clinic/models/report_hd_case_summary.py
index 1e0bdeb..ff10fa3 100644
--- a/netforce_clinic/models/report_hd_case_summary.py
+++ b/netforce_clinic/models/report_hd_case_summary.py
@@ -60,6 +60,8 @@ class ReportHDCaseSummary(Model):
         crr_month=int(date[5:7])
         weekday, crr_total_day=monthrange(year, crr_month)
         defaults=self.default_get(context=context)
+        date_from=defaults.get('date_from',date)
+        date_to=defaults.get('date_to',date)
         branch_id=defaults.get("branch_id",None)
         if branch_id:
             branch_id=branch_id[0]
@@ -77,6 +79,8 @@ class ReportHDCaseSummary(Model):
             time_start='%s 00:00:00'%obj.date_from
             time_stop='%s 23:59:59'%obj.date_to
             year=int(date[0:4])
+            date_from=obj.date_from
+            date_to=obj.date_to
 
         prev_year=year
         next_year=year
@@ -262,9 +266,10 @@ class ReportHDCaseSummary(Model):
             line['unit']=unit
             lines.append(line)
             index+=1
-
         context['defaults']={
             'date': date,
+            'date_from': date_from,
+            'date_to': date_to,
             'branch_id': branch_id,
             'department_id': department_id,
             }
@@ -278,9 +283,12 @@ class ReportHDCaseSummary(Model):
         elif branch_id:
             branch=get_model("clinic.branch").browse(branch_id)
             sub_name="(%s)" % branch.name or ""
+        print('>> ', context.get('defaults'))
         data={
             'branch_id': branch_id,
             'department_id': department_id,
+            'date_from': date_from,
+            'date_to': date_to,
             'date': date,
             'month': month_str,
             'year': year,
diff --git a/netforce_clinic/templates/report_hd_case_summary.hbs b/netforce_clinic/templates/report_hd_case_summary.hbs
index 91e8513..eb1b76e 100644
--- a/netforce_clinic/templates/report_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_hd_case_summary.hbs
@@ -42,14 +42,14 @@
     <thead>
         <th>
             <center>
-                <a href="/ui#name=clinic_report_recent_patient&defaults.date={{date}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
+                <a href="/ui#name=clinic_report_recent_patient&defaults.date={{date}}&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
                     รายชื่อผู้ป่วยรับใหม่
                 </a>
             </center>
         </th>
         <th>
             <center>
-                <a href="/ui#name=clinic_report_discontinue_patient&defaults.date={{date}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
+                <a href="/ui#name=clinic_report_discontinue_patient&defaults.date={{date}}&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">
                     รายชื่อผู้ป่วยจำหน่าย
                 </a>
             </center>
@@ -122,7 +122,7 @@
             <span>
                 <center>
                     <b>
-                        <a href="/ui#name=clinic_report_medical_summary&defaults.date={{date}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">รวมจำนวนยาที่ใช้ประจำเดือน</a>
+                        <a href="/ui#name=clinic_report_medical_summary&defaults.date={{date}}&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}&defaults.branch_id={{branch_id}}&defaults.department_id={{department_id}}">รวมจำนวนยาที่ใช้ประจำเดือน</a>
                     </b>
                 </center>
             </span>
diff --git a/netforce_clinic/templates/report_shop.hbs b/netforce_clinic/templates/report_shop.hbs
index 2aab40e..2c6f28a 100644
--- a/netforce_clinic/templates/report_shop.hbs
+++ b/netforce_clinic/templates/report_shop.hbs
@@ -19,7 +19,9 @@
             <th>Lab</th>
             <th>Misc.</th>
             <th>Dlz</th>
+            <!--
             <th>Ref.Inv#</th>
+            -->
             <th>Picking#</th>
         </tr>
     </thead>
@@ -40,9 +42,11 @@
                 <td>{{currency lab zero=""}}</td>
                 <td>{{currency misc zero=""}}</td>
                 <td>{{currency dlz zero=""}}</td>
+                <!--
                 <td>
                     {{view "link" string=inv_ref action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}}
                 </td>
+                -->
                 <td>
                     {{#if pick_id}}
                         {{view "link" string=pick_ref action="pick_out" action_options="mode=form" active_id=pick_id}}
@@ -59,11 +63,11 @@
         <th></th>
         <th></th>
         <th></th>
-        <th>{{currency total_fee zero=""}}</th>
-        <th>{{currency total_mdc zero=""}}</th>
-        <th>{{currency total_lab zero=""}}</th>
-        <th>{{currency total_misc zero=""}}</th>
-        <th>{{currency total_dlz zero=""}}</th>
+        <th>{{currency total_fee}}</th>
+        <th>{{currency total_mdc}}</th>
+        <th>{{currency total_lab}}</th>
+        <th>{{currency total_misc}}</th>
+        <th>{{currency total_dlz}}</th>
         <th></th>
         <th></th>
     </tfoot>