diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml
index 5c31cf4..6a6e71a 100644
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_form.xml
@@ -2,7 +2,6 @@
     <head>
         <field name="state"/>
         <button string="Print" dropdown="1" icon="print">
-            <!--<item string="Reciept" method="print_receipt"/>-->
             <item string="Reciept" action="report_clinic_payment_form" action_options="convert=pdf"/>
         </button>
         <button string="Options" dropdown="1">
@@ -121,7 +120,7 @@
         <button string="Done" type="success" perm="clinic_hdcase_done" icon="ok" method="done" states="in_progress"/>
         <button string="Discard" type="danger" perm="clinic_hdcase_discard" icon="remove" action="clinic_hd_case_distcont" states="in_progress"/>
         <button string="Claim Expense" type="default" perm="clinic_hdcase_claim" icon="arrow-right" states="completed" method="request_fee"  attrs='{"invisible":[["req_fee","=",1]]}'/>
-        <button string="Pay" type="success" perm="clinic_hdcase_pay" icon="ok" method="pay" states="completed,waiting_payment" attrs='{"invisible":[["req_fee","=",0]]}'/>
+        <button string="Pay" type="success" perm="clinic_hdcase_pay" icon="ok" method="pay" states="completed" attrs='{"invisible":[["req_fee","=",0]]}'/>
    </foot>
     <related>
         <field name="invoices" click_action="view_invoice">
diff --git a/netforce_clinic/layouts/clinic_matching_payment_form.xml b/netforce_clinic/layouts/clinic_matching_payment_form.xml
index fa47254..c475aec 100644
--- a/netforce_clinic/layouts/clinic_matching_payment_form.xml
+++ b/netforce_clinic/layouts/clinic_matching_payment_form.xml
@@ -21,6 +21,8 @@
     <field name="pcode" span="3"/>
     <field name="hcode_id" span="3" attrs='{"required":[["pcode","=","SSO"]],"invisible":[["pcode","!=","SSO"]]}'/>
     <field name="file" span="3"/>
+    <field name="branch_id" span="2"/>
+    <field name="department_id" span="2"/>
     <field name="type" invisible="1" span="3"/>
     <tabs>
         <tab string="General">
diff --git a/netforce_clinic/migrations/repost_invoice.py b/netforce_clinic/migrations/repost_invoice.py
index 7a59ab8..c308fae 100644
--- a/netforce_clinic/migrations/repost_invoice.py
+++ b/netforce_clinic/migrations/repost_invoice.py
@@ -10,9 +10,9 @@ class Migration(migration.Migration):
         set_active_user(1)
         set_active_company(1)
         dom=[
-            ['department_id','=',2],
-            ['date','>=','2015-08-18'],
-            ['date','<=','2015-08-18'],
+            #['department_id','=',2],
+            #['date','>=','2015-08-18'],
+            #['date','<=','2015-08-18'],
         ]
         hdcase_ids=set()
         for hdcase in get_model('clinic.hd.case').search_browse(dom):
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 92bb355..465c37d 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -602,7 +602,8 @@ class HDCase(Model):
         obj=self.browse(ids[0])
         if obj.invoices:
             for inv in obj.invoices:
-                inv.void()
+                if inv.state=='waiting_payment':
+                    inv.void()
         due_date=obj.date[0:10]
         # cash, credit
         is_credit=context.get('is_credit') or False
diff --git a/netforce_clinic/models/matching_payment.py b/netforce_clinic/models/matching_payment.py
index 40878fb..13fc95c 100644
--- a/netforce_clinic/models/matching_payment.py
+++ b/netforce_clinic/models/matching_payment.py
@@ -73,6 +73,8 @@ class MatchingPayment(Model):
         'state': fields.Selection([['draft','Draft'],['approved','Approved']],'State'),
         'type': fields.Selection([['all','All'],['match','Match'],['unmatch','Not Match']],'Type'),
         'user_id': fields.Many2One("base.user","Approver"),
+        'department_id': fields.Many2One("clinic.department","Department"),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
     
     def _get_ptype(self,context={}):
@@ -146,13 +148,13 @@ class MatchingPayment(Model):
     def match(self,ids,context={}):
         obj=self.browse(ids)[0]
         lines=obj.get_line()
-        print("len.lines ", len(lines))
+        print("total lines: ", len(lines))
         patient_type=obj.patient_type_id
         if not patient_type:
-            raise Exception("not found patient type")
+            raise Exception("Not found patient type")
         contact=patient_type.contact_id
         if not contact:
-            raise Exception("contact not found")
+            raise Exception("Contact not found")
         st=get_model("clinic.setting").browse(1)
         st_pt=st.get_patient_hn()
         patient_hn=st_pt['hns']
@@ -167,7 +169,7 @@ class MatchingPayment(Model):
         dom.append(['partner_id',"=",contact.id])
         dom.append(['state','=', 'waiting_payment'])
         invoices=get_model('account.invoice').search_browse(dom)
-        print("len(invoices)", len(invoices))
+        print("total invoices: ", len(invoices))
         for invoice in invoices:
             pname,hn,card_no='', '', ''
             pname2=pname
@@ -359,7 +361,6 @@ class MatchingPayment(Model):
                         'state': 'match',
                     })
                 else:
-                    #print("not found")
                     hn=hn.replace("-", "")
                     hn=hn.replace("/", "")
                     phn=patient_hn.get(hn)
