From dacfa2bded23e8d71816e58f81f26d250c86ef78 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Mon, 26 Jan 2015 16:15:02 +0700
Subject: [PATCH] filter product

---
 netforce_clinic/layouts/clinic_menu.xml        | 2 +-
 netforce_clinic/layouts/clinic_prod_list.xml   | 5 +++++
 netforce_clinic/layouts/clinic_prod_search.xml | 5 +++++
 netforce_clinic/models/cycle.py                | 2 --
 setup.py                                       | 3 ++-
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 netforce_clinic/layouts/clinic_prod_list.xml
 create mode 100644 netforce_clinic/layouts/clinic_prod_search.xml

diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index cf82741..d371da5 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -49,7 +49,7 @@
         <item string="Sickbed" action="clinic_sickbed"/>
         <item string="Valcular Access" action="clinic_vascular_access"/>
     </item>
-    <item string="Reports" perm="clinic_report">
+    <item string="Reporting" perm="clinic_report">
         <item string="Visit Summary" action="clinic_report_visit"/>
         <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
         <item string="Medical Summary" action="clinic_report_medical_summary"/>
diff --git a/netforce_clinic/layouts/clinic_prod_list.xml b/netforce_clinic/layouts/clinic_prod_list.xml
new file mode 100644
index 0000000..cb175ad
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_prod_list.xml
@@ -0,0 +1,5 @@
+<inherit model="product" inherit="product_list">
+    <field name="brand_id" position="replace">
+        <field name="categ_id"/>
+    </field>
+</inherit>
diff --git a/netforce_clinic/layouts/clinic_prod_search.xml b/netforce_clinic/layouts/clinic_prod_search.xml
new file mode 100644
index 0000000..00682d5
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_prod_search.xml
@@ -0,0 +1,5 @@
+<inherit model="product" inherit="product_search">
+    <field name="categs" position="before">
+        <field name="categ_id" child_of="1"/>
+    </field>
+</inherit>
diff --git a/netforce_clinic/models/cycle.py b/netforce_clinic/models/cycle.py
index 870da38..1483d4a 100644
--- a/netforce_clinic/models/cycle.py
+++ b/netforce_clinic/models/cycle.py
@@ -61,10 +61,8 @@ class Cycle(Model):
         super().write(ids,vals,**kw)
         if 'color' in vals.keys():
             color=vals['color']
-            #old_color=obj.color
             dom=[]
             dom.append(['cycle_id','=',obj.id])
-            #dom.append(['cycle_color','=',old_color])
             for vs in get_model('clinic.visit').search_browse(dom):
                 vs.write({
                     'cycle_color': color,
diff --git a/setup.py b/setup.py
index 5b93df9..fc7b7e0 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+
 from netforce.setup import setup
 
 setup(