diff --git a/netforce_clinic/actions/clinic_schedule.xml b/netforce_clinic/actions/clinic_schedule.xml
index 896ef03..2b0b1b1 100644
--- a/netforce_clinic/actions/clinic_schedule.xml
+++ b/netforce_clinic/actions/clinic_schedule.xml
@@ -2,7 +2,7 @@
     <field name="string">Schedules</field>
     <field name="view_cls">multi_view</field>
     <field name="model">clinic.schedule</field>
-    <field name="modes">list,page,form,calendar</field>
+    <field name="modes">calendar,list,page,form</field>
     <field name="tabs">[["All",[]],["Draft",[["state","=","draft"]]],["Confirmed",[["state","=","confirmed"]]]]</field>
     <field name="menu">clinic_menu</field>
 </action>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index face1da..82f1f88 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -13,6 +13,7 @@
         <item string="Levels" action="clinic_personal_level"/>
     </item>
     <item string="Patients">
+        <item string="Register" action="clinic_patient" action_options="mode=form"/>
         <item string="Patients" action="clinic_patient"/>
         <item string="Dialyzers" action="clinic_dialyzer"/>
         <divider/>
@@ -36,6 +37,7 @@
         <item string="Generate Visit" action="clinic_gen_visit_form"/>
     </item>
     <item string="HD Cases" action="clinic_hd_case"/>
+    <!--<item string="POS" icon="arrow-right" url="/static/pos/index.html"/>-->
     <item string="Reports">
         <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_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index f2041f8..6ba4096 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -89,6 +89,7 @@
             <field name="note" nolabel="1"/> 
             <field name="active"/>
             <field name="resign_date" readonly="1"/>
+            <field name="rm_remain_visit" attrs='{"invisible":[["active","=","true"]]}'/>
         </tab>
     </tabs>
     <related>
diff --git a/netforce_clinic/layouts/clinic_schedule_calendar.xml b/netforce_clinic/layouts/clinic_schedule_calendar.xml
index 143affe..be3ed6f 100644
--- a/netforce_clinic/layouts/clinic_schedule_calendar.xml
+++ b/netforce_clinic/layouts/clinic_schedule_calendar.xml
@@ -1,4 +1,7 @@
 <calendar model="clinic.schedule" date_field="date" start_field="time_start" end_field="time_stop">
+    <head replace="1">
+        <button string="Print"/>
+    </head>
     <field name="name"/>
     <field name="state"/>
 </calendar>
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 8205eca..999f7ac 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -30,8 +30,8 @@ class HDCase(Model):
     
     _fields={
         "number": fields.Char("Number",required=True,search=True),
-        "time_start": fields.DateTime("Time start",required=True,search=True),
-        "time_stop": fields.DateTime("Time stop",required=True,search=True),
+        "time_start": fields.DateTime("Time Start",required=True,search=True),
+        "time_stop": fields.DateTime("Time Stop",required=True,search=True),
         "date": fields.Date("Time stop",required=True,search=True),
         "patient_id": fields.Many2One("clinic.patient","Patient",required=True,search=True),
         "nurse_id": fields.Many2One("clinic.personal","Approve By", domain=[['type','=','nurse']]),
@@ -44,7 +44,7 @@ class HDCase(Model):
         "per_bp_stop": fields.Integer("/Per stop"),
         "epo_tn" : fields.Char("EpoTn (Drug name)"),
         "epo_unit" : fields.Integer("EpoUnit (Unit of Used drug)"),
-        "hct": fields.Integer("HCT %"),
+        "hct": fields.Integer("HCT % (<40)"),
         "hct_msg" : fields.Char("HCT message"),
         "check_goverment_pay" : fields.Boolean("The Government Pay"),
         "check_personal_pay" : fields.Boolean("Pay yourself"),
@@ -99,7 +99,7 @@ class HDCase(Model):
         "number": _get_number,
         "company_id": lambda *a: get_active_company(),
         'hct': 0,
-        'hct_msg': "Reimbursement of medicines : 1,125/Week",
+        'hct_msg': "สามารถเบิกค่ายาสูงสุดไม่เกิน 1,125บาท ต่อ สัปดาห์",
         'fee_paid': False,
     }
     _order="date desc,number desc"
@@ -540,12 +540,12 @@ class HDCase(Model):
             data['hct']=0
         hct=data["hct"]
         msg=""
-        if(hct<=36):
-            msg="Reimbursement of medicines : 1,125/Week"
-        elif(hct>36 and hct<39):
-            msg="Reimbursement of medicines : 750/Week"
-        elif(hct>=39):
-            msg="Can not be drawn"
+        if(hct<36):
+            msg="สามารถเบิกค่ายาสูงสุดไม่เกิน 1,125บาท ต่อ สัปดาห์"
+        elif(hct>=36 and hct<=39):
+            msg="สามารถเบิกค่ายาสูงสุดไม่เกิน 750บาท ต่อ สัปดาห์"
+        elif(hct> 39):
+            msg="ไม่สามารถเบิกค่ายาฉีดได้ทุกตัว"
         data['hct_msg']=msg
         return data
 
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index 9666265..ffc7cff 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -82,6 +82,7 @@ class Patient(Model):
         'doctor_id': fields.Many2One("clinic.personal","Doctor",domain=[['type','=','doctor']]),
         "documents": fields.One2Many("document","related_id","Documents"),
         'resign_date': fields.Date("Resign Date"),
+        'rm_remain_visit': fields.Boolean("Auto Remove Remaining Visit"),
     }
 
     def _get_number(self,context={}):
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 8648700..5652b11 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,10 +1,14 @@
+customize ui
+    - attribute color for field
 cycle dialy
     -list of cycle items
     - report all compute all cost
 
+- sale medical
 visit dialy
     list of visits
 schedule planing for nurses / personal
 
 import payment
     - error report
+    - manual matching
