From 08911331eec62a56702f352eb8949f09cd72f12b Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Tue, 16 Dec 2014 16:53:36 +0700
Subject: [PATCH] clean

---
 .../clinic_report_payment_matching.xml        |  2 +-
 .../layouts/clinic_contact_form.xml           |  9 +++
 .../layouts/clinic_menu_inherit.xml           |  2 +-
 .../layouts/clinic_period_form.xml            | 11 +--
 .../layouts/clinic_period_list.xml            |  1 +
 .../clinic_report_payment_matching.xml        | 10 +--
 netforce_clinic/layouts/clinic_setting.xml    |  1 +
 .../layouts/import_clinic_payment_form.xml    | 11 ++-
 netforce_clinic/migrations/__init__.py        |  2 +-
 ...mport_clinic_hd_case.py => import_data.py} | 12 ++-
 netforce_clinic/models/__init__.py            |  1 +
 netforce_clinic/models/gen_visit.py           |  2 +-
 netforce_clinic/models/hd_case.py             |  3 +
 netforce_clinic/models/hd_case_expense.py     |  1 +
 netforce_clinic/models/import_patient.py      |  4 +-
 netforce_clinic/models/import_payment.py      |  8 +-
 netforce_clinic/models/import_visit.py        |  4 +-
 netforce_clinic/models/partner.py             | 12 +++
 netforce_clinic/models/period.py              | 17 +++-
 netforce_clinic/models/period_line.py         | 20 ++++-
 .../models/report_payment_matching.py         | 81 ++++++++++---------
 netforce_clinic/models/setting.py             |  1 +
 netforce_clinic/models/setting_policy.py      |  2 +
 netforce_clinic/models/setting_product.py     |  6 +-
 .../templates/report_payment_matching.hbs     | 21 ++---
 netforce_clinic/todo.txt                      |  5 ++
 26 files changed, 164 insertions(+), 85 deletions(-)
 create mode 100644 netforce_clinic/layouts/clinic_contact_form.xml
 rename netforce_clinic/migrations/{import_clinic_hd_case.py => import_data.py} (95%)
 create mode 100644 netforce_clinic/models/partner.py

diff --git a/netforce_clinic/actions/clinic_report_payment_matching.xml b/netforce_clinic/actions/clinic_report_payment_matching.xml
index 7eacbf6..6eb6df7 100644
--- a/netforce_clinic/actions/clinic_report_payment_matching.xml
+++ b/netforce_clinic/actions/clinic_report_payment_matching.xml
@@ -1,5 +1,5 @@
 <action>                                                                                                         
-    <field name="string">Payment Matching</field>
+<!--<field name="string">Payment Matching</field>-->
     <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.report.payment.matching</field>
     <field name="report_template">report_payment_matching</field>                                                      
diff --git a/netforce_clinic/layouts/clinic_contact_form.xml b/netforce_clinic/layouts/clinic_contact_form.xml
new file mode 100644
index 0000000..7fe9dd4
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_contact_form.xml
@@ -0,0 +1,9 @@
+<inherit model="partner" inherit="contact_form">
+    <field name="payment_terms" position="after">
+        <newline/>
+        <separator string="Clinic"/>
+        <field name="account_fee_id" />
+        <field name="account_mdc_id" />
+        <field name="account_service_id" />
+    </field>
+</inherit>
diff --git a/netforce_clinic/layouts/clinic_menu_inherit.xml b/netforce_clinic/layouts/clinic_menu_inherit.xml
index b63c0b2..263dabf 100644
--- a/netforce_clinic/layouts/clinic_menu_inherit.xml
+++ b/netforce_clinic/layouts/clinic_menu_inherit.xml
@@ -5,10 +5,10 @@
             <item string="Labor Cost Items" action="clinic_labor_cost_item"/>
             <item string="Labor Cost Entries" action="clinic_labor_cost_entry"/>
             <item string="Import Payment" action="import_clinic_payment"/>
+            <item string="Matching Invoice" action="clinic_report_payment_matching"/>
             <item string="HD Case Expense" action="clinic_hd_case_expense"/>
             <divider/>
             <header string="REPORTS"/>
-            <item string="Payment Matching" action="clinic_report_payment_matching"/>
             <item string="Staff Fee Summary" action="clinic_report_staff_fee_sum"/>
             <item string="Staff Fee Detail" action="clinic_report_staff_fee_detail"/>
         </item>
diff --git a/netforce_clinic/layouts/clinic_period_form.xml b/netforce_clinic/layouts/clinic_period_form.xml
index 855422a..656c2e0 100644
--- a/netforce_clinic/layouts/clinic_period_form.xml
+++ b/netforce_clinic/layouts/clinic_period_form.xml
@@ -1,14 +1,15 @@
 <form model="clinic.period">
     <head>
         <button string="Options" dropdown="1">
-            <item string="Copy" method="copy"/>
+            <!--<item string="Copy" method="copy"/>-->
         </button>
     </head>
     <group form_layout="stacked">
-        <field name="name" span="3"/>
-        <field name="date_start" span="3"/>
-        <field name="date_stop" span="3"/>
-        <field name="nmonth" span="3"/>
+        <field name="name" span="2"/>
+        <field name="date_start" span="2"/>
+        <field name="date_stop" span="2"/>
+        <field name="nmonth" span="2"/>
+        <field name="last_period_id" span="3"/>
         <field name="lines" nolabel="1">
             <list>
                 <field name="date_start"/>
diff --git a/netforce_clinic/layouts/clinic_period_list.xml b/netforce_clinic/layouts/clinic_period_list.xml
index 6fe5833..15653cf 100644
--- a/netforce_clinic/layouts/clinic_period_list.xml
+++ b/netforce_clinic/layouts/clinic_period_list.xml
@@ -1,3 +1,4 @@
 <list model="clinic.period">
     <field name="name"/>
+    <field name="last_period_id"/>
 </list>
diff --git a/netforce_clinic/layouts/clinic_report_payment_matching.xml b/netforce_clinic/layouts/clinic_report_payment_matching.xml
index cc90bb2..5a95b3c 100644
--- a/netforce_clinic/layouts/clinic_report_payment_matching.xml
+++ b/netforce_clinic/layouts/clinic_report_payment_matching.xml
@@ -1,7 +1,7 @@
 <form model="clinic.report.payment.matching">
-    <field name="date" span="2" mode="month" onchange="onchange_date"/>
-    <field name="date_from" span="2"/>
-    <field name="date_to" span="2"/>
-    <field name="state" span="2"/>
-    <field name="patient_id" span="2"/>
+    <field name="file" span="3" required="1"/>
+    <field name="type_id" span="3"/>
+    <!--<field name="date" span="3" mode="month" onchange="onchange_date"/>-->
+    <newline/>
+    <button string='Match' type="success" size="small" icon="ok" method="match_invoice"/>
 </form>
diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml
index 12cb2b2..e3b7d50 100644
--- a/netforce_clinic/layouts/clinic_setting.xml
+++ b/netforce_clinic/layouts/clinic_setting.xml
@@ -7,6 +7,7 @@
             <group form_layout="stacked">
                 <field name="waiting_approval" span="3"/>
                 <field name="real_time" span="3"/>
+                <field name="auto_gen" span="3"/>
                 <separator string="Expenes"/>
                 <field name="products" nolabel="1">
                     <list>
diff --git a/netforce_clinic/layouts/import_clinic_payment_form.xml b/netforce_clinic/layouts/import_clinic_payment_form.xml
index be9f56a..fa3f7ea 100644
--- a/netforce_clinic/layouts/import_clinic_payment_form.xml
+++ b/netforce_clinic/layouts/import_clinic_payment_form.xml
@@ -13,15 +13,14 @@
     <separator string="Summary"/>
     <tabs>
         <tab string="Information">
-            <field name="total_row" span="3" readonly="1"/>
-            <field name="match_qty" span="3" readonly="1"/>
-            <field name="unmatch_qty" span="3" readonly="1"/>
-            <field name="fail_qty" span="3" readonly="1"/>
-            <newline/>
+            <button string="Match" span="1" icon="ok" size="small" type="success"/>
+            <field name="match_qty" span="2" nolabel="1" readonly="1"/>
+            <button string="Un Match" span="1" icon="remove" size="small" type="danger"/>
+            <field name="unmatch_qty" span="2" nolabel="1" readonly="1"/>
             <field name="est_time" span="4" readonly="1"/>
         </tab>
         <tab string="Message">
-            <field name="msg" span="6" nolabel="1" width="1000" height="180"/>
+            <field name="msg" span="6" nolabel="1" width="500" height="120"/>
         </tab>
         <tab string="Accounting">
             <group form_layout="stacked">
diff --git a/netforce_clinic/migrations/__init__.py b/netforce_clinic/migrations/__init__.py
index e69df29..7232eae 100644
--- a/netforce_clinic/migrations/__init__.py
+++ b/netforce_clinic/migrations/__init__.py
@@ -1,2 +1,2 @@
 from . import clinic_setting
-from . import import_clinic_hd_case
+from . import import_data
diff --git a/netforce_clinic/migrations/import_clinic_hd_case.py b/netforce_clinic/migrations/import_data.py
similarity index 95%
rename from netforce_clinic/migrations/import_clinic_hd_case.py
rename to netforce_clinic/migrations/import_data.py
index 91439da..922e9ab 100644
--- a/netforce_clinic/migrations/import_clinic_hd_case.py
+++ b/netforce_clinic/migrations/import_data.py
@@ -6,7 +6,7 @@ from . import utils
 
 class Migration(migration.Migration):
     _name="import.clinic.hd.case"
-    _version="2.80"
+    _version="2.10"
     
     def import_visit(self,lines):
         visits={}
@@ -69,16 +69,24 @@ class Migration(migration.Migration):
         return visits
     
     def confirm_visit(self,visits):
+        st=get_model("clinic.setting").browse(1)
+        st.write({
+            'auto_gen': True,
+        })
         hd_case_ids=[]
         visit_ids=visits.keys()
         for visit in get_model('clinic.visit').browse(visit_ids):
             if visit!='confirmed':
                 visit.confirm()
                 hd_case=visit.hd_cases[0]
+                # lines
                 hd_case.write({
                     'hct': visits[visit.id]['hct'] or 0,
                 })
                 hd_case_ids.append(hd_case.id)
+        st.write({
+            'auto_gen': False,
+        })
         return hd_case_ids
         
     
@@ -94,14 +102,12 @@ class Migration(migration.Migration):
         fname='pks.xls'
         fpath=get_file_path(fname)
         lines=utils.read_excel(fpath,show_datetime=True)
-        company_id=get_active_company()
         set_active_company(1)
         visits=self.import_visit(lines)
         print("visit ", len(visits))
         hd_case_ids=self.confirm_visit(visits)
         print('hd case ', len(hd_case_ids))
         hd_case_ids=self.hdc_done(hd_case_ids)
-        set_active_company(company_id)
         print('Done ', len(hd_case_ids))
         return True
 
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 8159f72..b7ab062 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -11,6 +11,7 @@ from . import graduation
 from . import morbidity
 from . import nation
 from . import address
+from . import partner
 from . import patient
 from . import patient_type
 from . import patient_categ
diff --git a/netforce_clinic/models/gen_visit.py b/netforce_clinic/models/gen_visit.py
index 8985469..7648817 100644
--- a/netforce_clinic/models/gen_visit.py
+++ b/netforce_clinic/models/gen_visit.py
@@ -27,7 +27,7 @@ class GenVisit(Model):
         'sunday': fields.Boolean("Sunday"),
         'doctor_id': fields.Many2One("clinic.staff","Doctor",domain=[['type','=','doctor']]),
         'department_id': fields.Many2One("clinic.department","Department"),
-        "patient_type": fields.Selection([("sc","Social Security"),("uc","UC."),("others","Others")],"Patient Type"),
+        "patient_type": fields.Selection([("s","Social Security"),("u","UC."),("others","Others")],"Patient Type"),
         'patient_categ_id': fields.Many2One("clinic.patient.categ", "Patient Category"),
         'nurse_categ_id': fields.Many2One("clinic.staff.categ", "Nurse Category", domain=[['type','=','nurse']]),
     }
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 96f4543..729e663 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -887,6 +887,9 @@ class HDCase(Model):
                 }))
         # fee
         st=get_model("clinic.setting").browse(1)
+        if not st.auto_gen:
+            return
+
         if not vals.get('lines'):
             vals['lines']=[]
             for st_prod in st.products:
diff --git a/netforce_clinic/models/hd_case_expense.py b/netforce_clinic/models/hd_case_expense.py
index 2e68529..fd4cda8 100644
--- a/netforce_clinic/models/hd_case_expense.py
+++ b/netforce_clinic/models/hd_case_expense.py
@@ -36,6 +36,7 @@ class HDCaseExpense(Model):
         'note': fields.Text("Note"),
         'pt_conflict': fields.Boolean("Patient Conclict",function="_get_patient_conflict"),
         'company_id': fields.Many2One("company","Company"),
+        'match_id': fields.Many2One("clinic.report.payment.matching","Match"),
     }
 
     _defaults={
diff --git a/netforce_clinic/models/import_patient.py b/netforce_clinic/models/import_patient.py
index e9c957d..64ac1f8 100644
--- a/netforce_clinic/models/import_patient.py
+++ b/netforce_clinic/models/import_patient.py
@@ -49,9 +49,9 @@ class ImportPatient(Model):
         obj=self.browse(ids)[0]
         ptype=obj.patient_type_id
         res={}
-        if ptype.code=='PKS':
+        if ptype.code=='S':
             res=self.import_patient_pks(ids,context)
-        elif ptype.code=='UC':
+        elif ptype.code=='U':
             res=self.import_patient_uc(ids,context)
         else:
             raise Exception('No script to import patient with type %s'%ptype.name)
diff --git a/netforce_clinic/models/import_payment.py b/netforce_clinic/models/import_payment.py
index a2c9274..1a4019d 100644
--- a/netforce_clinic/models/import_payment.py
+++ b/netforce_clinic/models/import_payment.py
@@ -90,6 +90,8 @@ class ImportPayment(Model):
         'state': 'draft',
         'is_uc': 0,
         'node': 'HDBills',
+        'match_qty': 0,
+        'unmatch_qty': 0,
     }
     
     def get_patient_invoice(self,state="waiting_payment"):
@@ -253,9 +255,9 @@ class ImportPayment(Model):
             raise Exception("File not found")
         patient_type=obj.type_id
         res={}
-        if patient_type.code in ('PKS','SC'):
+        if patient_type.code in ('S'):
             res=self.import_payment_pks(ids,context)
-        elif patient_type.code in ('UC','uc','UC.','uc.'):
+        elif patient_type.code in ('U'):
             res=self.import_payment_uc(ids,context)
         else:
             raise Exception("No script to import payment for type %s"%patient_type.name)
@@ -343,7 +345,7 @@ class ImportPayment(Model):
         is_uc=0
         type_id=data['type_id']
         ptype=get_model('clinic.patient.type').browse(type_id)
-        if ptype.code=='UC':
+        if ptype.code=='U':
             is_uc=1
         data['is_uc']=is_uc
         return data
diff --git a/netforce_clinic/models/import_visit.py b/netforce_clinic/models/import_visit.py
index 7d440a5..043890a 100644
--- a/netforce_clinic/models/import_visit.py
+++ b/netforce_clinic/models/import_visit.py
@@ -49,9 +49,9 @@ class ImportVisit(Model):
         obj=self.browse(ids)[0]
         ptype=obj.patient_type_id
         res={}
-        if ptype.code=='PKS':
+        if ptype.code=='S':
             res=self.import_visit_pks(ids,context)
-        elif ptype.code=='UC':
+        elif ptype.code=='U':
             res=self.import_visit_uc(ids,context)
         else:
             raise Exception('No script to import visit with type %s'%ptype.name)
diff --git a/netforce_clinic/models/partner.py b/netforce_clinic/models/partner.py
new file mode 100644
index 0000000..aeb4aa5
--- /dev/null
+++ b/netforce_clinic/models/partner.py
@@ -0,0 +1,12 @@
+from netforce.model import Model, fields
+
+class Partner(Model):
+    _inherit="partner"
+
+    _fields={
+        "account_mdc_id": fields.Many2One("account.account","Account Medicine",multi_company=True),
+        "account_fee_id": fields.Many2One("account.account","Account Fee",multi_company=True),
+        "account_service_id": fields.Many2One("account.account","Account Service",multi_company=True),
+    }
+
+Partner.register()
diff --git a/netforce_clinic/models/period.py b/netforce_clinic/models/period.py
index 8829320..a8d2f79 100644
--- a/netforce_clinic/models/period.py
+++ b/netforce_clinic/models/period.py
@@ -1,5 +1,4 @@
 import time
-from datetime import datetime, timedelta
 from calendar import monthrange
 
 from netforce.model import Model, fields
@@ -8,15 +7,25 @@ class Period(Model):
     _name="clinic.period"
     _string="Period"
     
+    def _get_last_period(self,ids,context={}):
+        res={}
+        for obj in self.browse(ids):
+            last_id=None
+            for line in obj.lines:
+                if line.close:
+                    last_id=line.id
+            res[obj.id]=last_id
+        return res
+
     _fields={
         "name": fields.Char("Name",required=True,search=True),
         'date_start': fields.Date("From",required=True),
         'date_stop': fields.Date("To",required=True),
-        #'duration': fields.Integer("Day in Period",required=True),
-        'nmonth': fields.Integer("Total Copy",required=True),
+        'nmonth': fields.Integer("Count",required=True),
         'lines': fields.One2Many("clinic.period.line","period_id", "Lines"),
+        'last_period_id': fields.Many2One("clinic.period.line","Last Period",function="_get_last_period"),
     }
-    
+        
     def _get_start(self,context={}):
         year=time.strftime("%Y")
         return '%s-01-01'%year
diff --git a/netforce_clinic/models/period_line.py b/netforce_clinic/models/period_line.py
index e14084c..a8c6ec5 100644
--- a/netforce_clinic/models/period_line.py
+++ b/netforce_clinic/models/period_line.py
@@ -5,7 +5,7 @@ from netforce.model import Model, fields
 class PeriodLine(Model):
     _name="clinic.period.line"
     _string="Period Line"
-    
+
     def _get_total(self,ids,context={}):
         res={}
         fmt='%Y-%m-%d'
@@ -15,12 +15,19 @@ class PeriodLine(Model):
             days=(stop-start).days
             res[obj.id]=days
         return res
+    
+    def _get_name(self,ids,context={}):
+        res={}
+        for obj in self.browse(ids):
+            res[obj.id]='%s - %s'%(obj.date_start, obj.date_stop)
+        return res
 
     _fields={
+        'name': fields.Char("Name",function="_get_name",store=True),
         "period_id": fields.Many2One("clinic.period", "Period"),
         'date_start': fields.Date("Date Start"),
         'date_stop': fields.Date("Date Stop"),
-        'day_total': fields.Integer("Total Day",function="_get_total"),
+        'day_total': fields.Integer("Duration (Day)",function="_get_total"),
         'state': fields.Selection([['draft','Draft'],['done','Done']],"State"),
         'close': fields.Boolean("Close"),
     }
@@ -29,5 +36,14 @@ class PeriodLine(Model):
         'state': 'draft',
         'close': False,
     }
+    
+    def create(self,vals,**kw):
+        id=super().create(vals,**kw)
+        self.function_store([id])
+        return id
+
+    def write(self,ids,vals,**kw):
+        super().write(ids,vals,**kw)
+        self.function_store(ids)
 
 PeriodLine.register()
diff --git a/netforce_clinic/models/report_payment_matching.py b/netforce_clinic/models/report_payment_matching.py
index 4de0a6a..025e0dc 100644
--- a/netforce_clinic/models/report_payment_matching.py
+++ b/netforce_clinic/models/report_payment_matching.py
@@ -16,6 +16,8 @@ class ReportPaymentMatching(Model):
         "date_to": fields.Date("To", required=True),
         'state': fields.Selection([['draft','Draft'],['waiting_matching','Waiting Matching'],['match','Match'],['unmatch','Unmatch'],['approved','Approved']],'State'),
         'patient_id': fields.Many2One("clinic.patient","Patient"),
+        'file': fields.File("File"),
+        'type_id': fields.Many2One("clinic.patient.type","Patient Type",required=True),
     }
 
     def _get_date_from(self,context={}):
@@ -26,54 +28,59 @@ class ReportPaymentMatching(Model):
         year,month,day=time.strftime("%Y-%m-%d").split("-")
         weekday, total_day=monthrange(int(year), int(month))
         return "%s-%s-%s"%(year,month,total_day)
+    
+    def _get_type_id(self,context={}):
+        st=get_model("clinic.setting").browse(1)
+        return st.patient_type_id.id
 
     _defaults={
         'date': lambda *a: time.strftime("%Y-%m-%d"),
         'date_from': _get_date_from,
         'date_to': _get_date_to,
         'state': 'match',
+        'type_id': _get_type_id,
     }
-    
-    def get_report_data(self,ids,context={}):
-        year, month=time.strftime("%Y-%m").split("-")
-        weekday, total_day=monthrange(int(year), int(month))
-        time_start='%s-%s-01'%(year,str(month).zfill(2))
-        time_stop='%s-%s-%s'%(year,str(month).zfill(2),total_day)
 
-        defaults=context.get('defaults')
-        if defaults:
-            year,month,total_day=defaults['date'].split("-")
-            weekday, total_day=monthrange(int(year), int(month))
-            time_start='%s-%s-01'%(year,str(month).zfill(2))
-            time_stop='%s-%s-%s'%(year,str(month).zfill(2),total_day)
+    def match_invoice(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        if not obj.file:
+            raise Exception("File not found!")
 
-        if ids:
-            obj=self.browse(ids)[0]
-            month=obj.date_from.split("-")[1]
-            time_start=obj.date_from
-            time_stop=obj.date_to
-
-        dom=[]
-        dom.append(['time_start','>=','%s 00:00:00'%time_start])
-        dom.append(['time_stop','<=','%s 23:59:59'%time_stop])
-        
-        lines=[]
-
-        company_id=get_active_company()
-        company=get_model('company').browse(company_id)
-        month_str=utils.MONTHS['th_TH'][int(month)]
-
-        lines=sorted(lines, key=lambda x: x['prod_name'])
-        year=int(year)+543
-
-        data={
-            'company_name': company.name or "",
-            'parent_company_name': company.parent_id.name or "",
-            'lines': lines,
-            'month': month_str,
-            'year': year,
+        for exp in get_model("clinic.hd.case.expense").search_browse([]):
+            exp.write({
+                'match_id': obj.id,
+            })
+        return {
+            'next': {
+                'name': 'clinic_report_payment_matching',
+                'mode': 'form',
+                'active_id': obj.id,
+            },
+            'flash': 'Match successfully',
         }
 
+    def get_report_data(self,ids,context={}):
+        year, month=time.strftime("%Y-%m").split("-")
+        obj_id=None
+        if ids:
+            obj=self.browse(ids)[0]
+            obj_id=obj.id
+        lines=[]
+        for exp in get_model("clinic.hd.case.expense").search_browse([]):
+            if exp.match_id.id!=obj_id:
+                continue
+            patient=exp.patient_id
+            lines.append({
+                'name': patient.name,
+                'fee': 'Yes',
+                'medicine': 'Yes',
+                'service': 'Yes',
+                'state': 'Match',
+            })
+
+        data={
+            'lines': lines,
+        }
         return data
 
     def onchange_date(self,context={}):
diff --git a/netforce_clinic/models/setting.py b/netforce_clinic/models/setting.py
index 9bfc087..9020e47 100644
--- a/netforce_clinic/models/setting.py
+++ b/netforce_clinic/models/setting.py
@@ -21,6 +21,7 @@ class ClinicSetting(Model):
         'patient_type_id': fields.Many2One("clinic.patient.type","Default Type"), # Import payment
         'find_dlz': fields.Boolean("Find Dialyzer After Confirm Visit"), # Visit
         'stock_journal_id': fields.Many2One("stock.journal","Default Journal"),
+        'auto_gen': fields.Boolean("Auto Gen") # HD Case
     }
 
     _defaults={
diff --git a/netforce_clinic/models/setting_policy.py b/netforce_clinic/models/setting_policy.py
index cf86fdd..9180b40 100644
--- a/netforce_clinic/models/setting_policy.py
+++ b/netforce_clinic/models/setting_policy.py
@@ -11,6 +11,8 @@ class SettingPolicy(Model):
         "invoice_option": fields.Selection([("fee_mdc_plus","Combine Fee & Medicine"),("fee_mdc_split","Split Fee & Medicine")],"Option"),
     }
 
+    _order="patient_type_id" 
+
     def _write(self,ids,vals,**kw):
         obj=self.browse(ids)[0]
         if obj.invoice_policy=='fee':
diff --git a/netforce_clinic/models/setting_product.py b/netforce_clinic/models/setting_product.py
index 1df607d..f998c4a 100644
--- a/netforce_clinic/models/setting_product.py
+++ b/netforce_clinic/models/setting_product.py
@@ -6,7 +6,7 @@ class SettingProduct(Model):
 
     _fields={
         "setting_id": fields.Many2One("clinic.setting","Setting"),
-        "type": fields.Selection([("fee","Fee"),('medicine','Medicine'),("others","Others")],"Type",required=True),
+        "type": fields.Selection([("fee","Fee"),('medicine','Medicine'),('service','Service'),("others","Others")],"Type",required=True),
         "patient_type_id": fields.Many2One("clinic.patient.type","Patient Type"),
         'uom_id': fields.Many2One("uom","UOM", required=True),
         "product_id": fields.Many2One("product","Product"),
@@ -15,14 +15,14 @@ class SettingProduct(Model):
         'qty': fields.Integer("Qty"),
         'amount': fields.Float("Amount"),
     }
-    
+
     _defaults={
         'type': 'fee',
         'patient_type': 'sc',
         'qty': 1,
     }
 
-    _order="patient_type,type"
+    _order="patient_type_id,type"
     
 
 SettingProduct.register()
diff --git a/netforce_clinic/templates/report_payment_matching.hbs b/netforce_clinic/templates/report_payment_matching.hbs
index 6271ac1..b75f8ea 100644
--- a/netforce_clinic/templates/report_payment_matching.hbs
+++ b/netforce_clinic/templates/report_payment_matching.hbs
@@ -1,20 +1,23 @@
 <center>
-    <h2>Payment Matching</h2>
-    <h4>
-        {{#if is_duration}}
-            ระหว่างวันที่ {{from}} ถึง {{to}}
-        {{else}}
-            ประจำเดือน {{month}} {{year}}
-        {{/if}}
-    </h4>
+    <h4>Payment Matching</h4>
 </center>
 {{#if lines}}
 <table class="table table-condensed table-striped">
     <thead>
+        <th>Patient</th>
+        <th>Fee(1,500)</th>
+        <th>Medicine</th>
+        <th>Service</th>
+        <th>Status</th>
     </thead>
     <tbody>
         {{#each lines}}
             <tr>
+                <td>{{name}}</td>
+                <td>{{fee}}</td>
+                <td>{{medicine}}</td>
+                <td>{{service}}</td>
+                <td>{{state}}</td>
             </tr>
         {{/each}}
     </tbody>
@@ -22,5 +25,5 @@
     </tfoot>
 </table>
 {{else}}
-    No items to display.
+    Waiting matching.
 {{/if}}
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 70a2932..7720d8c 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,3 +1,7 @@
+==
+ if patient not do visit before treatment , how to do?
+==
+import payment
 ======
     import payment
         step:
@@ -6,4 +10,5 @@
             3. import 
                 - find import
                 - 
+    - change day schedue relate
 ======