From 9897ef9e35c543a05422629ead69498d465a3868 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Tue, 21 Oct 2014 23:05:14 +0700
Subject: [PATCH 1/2] xxxx

---
 netforce_clinic/models/__init__.py | 1 -
 netforce_clinic/models/visit.py    | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 15f8287..dbf2f99 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -12,7 +12,6 @@ from . import patient_cause_line
 from . import patient_comorbidity_line
 from . import patient_morbidity_line
 from . import race
-from . import schedule
 from . import setting
 from . import visit
 from . import visit_line
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index 962f045..5c0c914 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -62,7 +62,6 @@ class Visit(Model):
 
     def _get_nurse(self,context={}):
         user_id=get_active_user()
-        print("user_id ",user_id)
         nurse_ids=get_model("clinic.nurse").search([['user_id','=',user_id]])
         if nurse_ids:
             return nurse_ids[0]
@@ -71,18 +70,20 @@ class Visit(Model):
     def _get_time_start(self,context={}):
         now=datetime.now()
         starttime=now.strftime("%Y-%m-%d %H:%M:%S")
+        print(":>> ", starttime)
         return starttime
 
     def _get_time_stop(self,context={}):
         hr=timedelta(seconds=3600)
         now=datetime.now()
         stoptime=(now+hr).strftime("%Y-%m-%d %H:%M:%S")
+        print('::: ', stoptime)
         return stoptime
 
     _defaults={
         "state": "draft",
-        'time_start': _get_time_start,
-        'time_stop': _get_time_stop,
+        #'time_start': _get_time_start,
+        #'time_stop': _get_time_stop,
         "number": "/",
         "company_id": lambda *a: get_active_company(),
         'nurse_id': _get_nurse,

From abc4ad9b02110a4f3f8757f253c33887efd2f7d0 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Wed, 22 Oct 2014 09:25:14 +0700
Subject: [PATCH 2/2] fix

---
 netforce_clinic/layouts/clinic_menu_inherit.xml | 10 +++++++++-
 netforce_clinic/models/hd_case.py               |  8 +++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_menu_inherit.xml b/netforce_clinic/layouts/clinic_menu_inherit.xml
index 87aa347..e69a5e6 100644
--- a/netforce_clinic/layouts/clinic_menu_inherit.xml
+++ b/netforce_clinic/layouts/clinic_menu_inherit.xml
@@ -1,7 +1,15 @@
 <inherit inherit="account_menu">
     <item string="Settings" position="before">
         <item string="Ratchawat">
-            <item string="Import Payments" action="clinic_import_payment"/>
+            <header string="IMPORT PAYMENT"/>
+            <item string="Medical Government" action="clinic_import_payment"/>
+            <item string="Social Security" action="clinic_import_payment"/>
+            <item string="NHSO 30฿" action="clinic_import_payment"/>
+            <divider/>
+            <header string="REPORTS"/>
+            <item string="Medical Government" action="clinic_import_payment"/>
+            <item string="Social Security" action="clinic_import_payment"/>
+            <item string="NHSO 30฿" action="clinic_import_payment"/>
         </item>
     </item>
 </inherit>
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 4e489b6..334b67b 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -205,6 +205,8 @@ class HDcase(Model):
 
     def make_payment(self,ids,context={}):
         obj=self.browse(ids)[0]
+        if not obj.total:
+            return
         remaining_amt=0.0
         for line in obj.lines:
             remaining_amt+=line.amount or 0.0
@@ -215,6 +217,8 @@ class HDcase(Model):
             raise Exception("No contact on this patient")
         company_id=get_active_company()
         account_id=obj.pay_account_id.id
+        if not account_id:
+            raise Exception("No Account for payment")
         vals={
             "partner_id": partner_id,
             "company_id": company_id,
@@ -534,7 +538,9 @@ class HDcase(Model):
 
     def onchange_hct(self,context={}):
         data=context['data']
-        hct=data.get("hct",0)
+        if not data.get("hct"):
+            data['hct']=0
+        hct=data["hct"]
         msg=""
         if(hct<=36):
             msg="Reimbursement of medicines : 1,125/Week"