From 0baec7195b6c8f83dfa35af21e9b89b2473e41d7 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Fri, 13 Mar 2015 18:55:50 +0700
Subject: [PATCH] fix

---
 netforce_clinic/layouts/clinic_cycle_item_form.xml | 4 ++--
 netforce_clinic/layouts/clinic_staff_form.xml      | 6 ++----
 netforce_clinic/todo.txt                           | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index f05f0c2..2ce57dd 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -20,8 +20,8 @@
             <field name="lines" nolabel="1">
                 <list>
                     <field name="nurse_id" domain='[["type","=","nurse"]]' onchange="onchange_nurse"/>
-                    <field name="level_id"/>
-                    <field name="categ_id"/>
+                    <!--<field name="level_id"/>-->
+                    <!--<field name="categ_id"/>-->
                 </list>
             </field>
         </tab>
diff --git a/netforce_clinic/layouts/clinic_staff_form.xml b/netforce_clinic/layouts/clinic_staff_form.xml
index 8ea65df..ed742ac 100644
--- a/netforce_clinic/layouts/clinic_staff_form.xml
+++ b/netforce_clinic/layouts/clinic_staff_form.xml
@@ -34,10 +34,8 @@
                 <field name="active"/>
             </group>
         </tab>
-        <tab string="Working Location">
-        <!--<field name="branch_id" required="1"/>-->
-        <!--<field name="department_id" domain='[["branch_id","=",branch_id]]' required="1"/>-->
-        <field name="departments"/>
+        <tab string="Location">
+            <field name="departments"/>
         </tab>
         <tab string="Professional Information">
             <field name="prof_license" attrs='{"invisible":[["type","in",["staff"]]]}'/>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index e20a4b2..81f6e30 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -10,3 +10,6 @@ report cycle item :
 report:
     - reciept:
         - remove border line
+
+merge doctor:
+