From 5383a3cc6a3253b9f43699d2316a1776bfde2225 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Fri, 21 Aug 2015 11:22:53 +0700
Subject: [PATCH] show product by categ in clinic setting

---
 netforce_clinic/layouts/clinic_setting.xml    |   7 ++-----
 .../models/report_medical_summary.py          |  12 ++++++------
 netforce_clinic/models/setting.py             |   3 +--
 .../reports/report_cycle_item.xlsx            | Bin 5777 -> 5852 bytes
 .../templates/report_cycle_item.hbs           |   2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml
index b33ff9e..75a0875 100644
--- a/netforce_clinic/layouts/clinic_setting.xml
+++ b/netforce_clinic/layouts/clinic_setting.xml
@@ -10,11 +10,6 @@
     <separator string="Visit"/>
     <group form_layout="stacked">
         <field name="find_dlz"/>
-        <!--
-        <newline/>
-        <field name="auto_gen_visit" string="Next Gen"/>
-        <field name="next_date" span="3"/>
-        -->
     </group>
     <separator string="HD Case"/>
     <group form_layout="stacked">
@@ -38,4 +33,6 @@
     <separator string="RD Shop"/>
     <field name="shop_type_id"/>
     <field name="signature"/>
+    <separator string="Reporting"/>
+    <field name="product_categ_view"/>
 </form>
diff --git a/netforce_clinic/models/report_medical_summary.py b/netforce_clinic/models/report_medical_summary.py
index 9110b4b..a83c6e1 100644
--- a/netforce_clinic/models/report_medical_summary.py
+++ b/netforce_clinic/models/report_medical_summary.py
@@ -86,8 +86,12 @@ class ReportMedicalSummary(Model):
         dom=[]
         dom.append(['type','=','stock'])
         dom.append(['report_visible','=',True])
-        if prod_categ_id:
-            dom.append(['categ_id.id','child_of',prod_categ_id])
+        st=get_model("clinic.setting").browse(1)
+        ct_ids=[]
+        for categ in st.product_categ_view:
+            ct_ids.append(categ.id)
+        if ct_ids:
+            dom.append(['categ_id.id','in',ct_ids])
         categ_ids=set()
         for prod in get_model("product").search_browse(dom):
             prod_code=prod.code or ""
@@ -124,10 +128,6 @@ class ReportMedicalSummary(Model):
                     continue
                 if categ and categ.id not in list(categ_ids):
                     continue
-                #if line.type=='fee' or prod.type=='service':
-                    #continue
-                #if prod_categ_id and prod_categ_id != prod.categ_id.id:
-                    #continue
                 products[prod_code][patient_type_id]['qty']+=line.qty
 
         lines=[]
diff --git a/netforce_clinic/models/setting.py b/netforce_clinic/models/setting.py
index 10ee472..907a73f 100644
--- a/netforce_clinic/models/setting.py
+++ b/netforce_clinic/models/setting.py
@@ -1,4 +1,3 @@
-import time
 from datetime import datetime, timedelta
 from calendar import monthrange
 
@@ -54,7 +53,6 @@ class ClinicSetting(Model):
         'schd_to': fields.Date("To"),
         'department_id': fields.Many2One("clinic.department","Department"),
         'branch_id': fields.Many2One("clinic.branch","Branch"),
-        'shop_categs': fields.Many2Many("product.categ","Categs"),
         'shop_type_id': fields.Many2One("clinic.patient.type","Patient Type"),
         'skip_type_id': fields.Many2One("clinic.patient.type","Skip Type"), # Matching HD Case
         "cash_account_id": fields.Many2One("account.account","Cash Account",multi_company=True),
@@ -65,6 +63,7 @@ class ClinicSetting(Model):
         'next_date': fields.DateTime("Next Gen"),
         'staff_from_id': fields.Many2One("clinic.staff","Staff From"),
         'staff_to_id': fields.Many2One("clinic.staff","Staff To"),
+        'product_categ_view': fields.Many2Many("product.categ","Product Category View"),
     }
 
     _defaults={
diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx
index d867e670a277223a2813cc46222fa7992d1fc979..fc1e5b1291c1caea404f26a440b1f93becfef71f 100644
GIT binary patch
delta 3340
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
MbBWMB<oJE$U&B%xBLDyZ

delta 3345
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

diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs
index b5b150a..5cab149 100644
--- a/netforce_clinic/templates/report_cycle_item.hbs
+++ b/netforce_clinic/templates/report_cycle_item.hbs
@@ -49,7 +49,7 @@
                         <td>รวม</td>
                         <td></td>
                         <td style="text-align:center">{{no}}</td>
-                        <td colspan="10" style="text-align:right">
+                        <td colspan="10">
                             {{#each epo_items}}
                                 {{name}} = {{qty}} &nbsp;&nbsp;&nbsp;
                             {{/each}}