From 4583f43d0b0878aad027401458e6e231a70a6656 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Wed, 11 Feb 2015 14:51:21 +0700
Subject: [PATCH] matching payment

---
 .../actions/clinic_matching_payment.xml       |  14 +-
 .../layouts/clinic_matching_hdcase.xml        |   1 +
 .../layouts/clinic_matching_payment.xml       |  37 +--
 netforce_clinic/layouts/clinic_menu.xml       |   2 +-
 netforce_clinic/models/matching_hdcase.py     |  23 +-
 netforce_clinic/models/matching_payment.py    | 227 +++++++++++++++++-
 netforce_clinic/reports/matching_hdcase.xlsx  | Bin 5023 -> 5551 bytes
 netforce_clinic/reports/matching_payment.xlsx | Bin 0 -> 5023 bytes
 netforce_clinic/templates/matching_hdcase.hbs |  28 ++-
 .../templates/matching_payment.hbs            |  29 +++
 netforce_clinic/todo.txt                      |  83 +------
 11 files changed, 312 insertions(+), 132 deletions(-)
 create mode 100644 netforce_clinic/reports/matching_payment.xlsx
 create mode 100644 netforce_clinic/templates/matching_payment.hbs
diff --git a/netforce_clinic/actions/clinic_matching_payment.xml b/netforce_clinic/actions/clinic_matching_payment.xml
index be54106..7f23370 100644
--- a/netforce_clinic/actions/clinic_matching_payment.xml
+++ b/netforce_clinic/actions/clinic_matching_payment.xml
@@ -1,8 +1,8 @@
-<record model="action">
-    <field name="name">clinic_matching_payment</field>
-    <field name="view">form_view</field>
+<action>                                                                                                         
+    <field name="string">Payment Matching</field>
+    <field name="view_cls">report</field>                                                                        
     <field name="model">clinic.matching.payment</field>
-    <field name="view_xml">clinic_matching_payment</field>
-    <field name="menu">account_menu</field>
-</record>
-
+    <field name="report_template">matching_payment</field>                                                      
+    <field name="report_template_xls">matching_payment</field>                                                         
+    <field name="menu">clinic_menu</field>                                                                  
+</action>  
diff --git a/netforce_clinic/layouts/clinic_matching_hdcase.xml b/netforce_clinic/layouts/clinic_matching_hdcase.xml
index 1838681..61b69ad 100644
--- a/netforce_clinic/layouts/clinic_matching_hdcase.xml
+++ b/netforce_clinic/layouts/clinic_matching_hdcase.xml
@@ -1,4 +1,5 @@
 <form model="clinic.matching.hdcase">
     <field name="date" span="2"/>
     <field name="file" span="3"/>
+    <field name="state" span="3"/>
 </form>
diff --git a/netforce_clinic/layouts/clinic_matching_payment.xml b/netforce_clinic/layouts/clinic_matching_payment.xml
index be99ddf..0a409d9 100644
--- a/netforce_clinic/layouts/clinic_matching_payment.xml
+++ b/netforce_clinic/layouts/clinic_matching_payment.xml
@@ -1,31 +1,18 @@
-<form model="clinic.matching.payment" title="Matching Payment">
+<form model="clinic.matching.payment" title="Payment Matching">
     <head>
         <button string="Options" dropdown="1">
             <item string="Update Identification" method="update_id"/>
-            <item string="Print Log" icon="print"/>
+            <item string="Import Payment" method="do_import" type="default"/>
         </button>
     </head>
-    <tabs>
-        <tab string="General">
-            <separator string="1. Click Match > 2. Check Items > 3. Import Payment"/>
-            <field name="date" onchange="onchange_date" mode="month" span="3"/>
-            <field name="date_from" span="3"/>
-            <field name="date_to" span="3"/>
-            <newline/>
-            <field name="file" span="3"/>
-            <field name="patient_type_id" onchange="onchange_ptype" span="3"/>
-            <field name="pcode" span="3"/>
-            <field name="hcode_id" span="3"/>
-        </tab>
-        <tab string="Log">
-            <field name="note" nolabel="1" width="1000" height="250"/>
-        </tab>
-    </tabs>
-    <foot replace="1">
-        <button string="Match" method="match" icon="ok" type="success"/>
-        <button string="Import Payment" method="do_import" icon="arrow-right" type="default"/>
-    </foot>
-    <related>
-        <field name="expenes"/>
-    </related>
+    <separator string="1. Click Match > 2. Check Items > 3. Import Payment"/>
+    <field name="date" onchange="onchange_date" mode="month" span="2"/>
+    <field name="date_from" span="2"/>
+    <field name="date_to" span="2"/>
+    <field name="file" span="4"/>
+    <newline/>
+    <field name="patient_type_id" onchange="onchange_ptype" span="2"/>
+    <field name="pcode" span="2"/>
+    <field name="hcode_id" span="2"/>
+    <button string="Import Payment" method="do_import" type="default" icon='arrow-right' size="small"/>
 </form>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index fc615f1..b4ebe25 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -44,13 +44,13 @@
     </item>
     <item string="HD Cases" perm="clinic_hdcase">
         <item string="HD Cases" action="clinic_hd_case"/>
-        <item string="HD Cases Matching" action="clinic_matching_hdcase"/>
         <item string="RD Shop" action="clinic_shop" perm="clinic_shop"/>
         <item string="Sickbed" action="clinic_sickbed"/>
     </item>
     <item string="Reporting" perm="clinic_report">
         <item string="Visit Summary" action="clinic_report_visit"/>
         <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
+        <item string="HD Cases Matching" action="clinic_matching_hdcase" perm="clinic_matching_hdcase"/>
         <item string="Medical Summary" action="clinic_report_medical_summary"/>
         <item string="Recent Patient" action="clinic_report_recent_patient"/>
         <item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
diff --git a/netforce_clinic/models/matching_hdcase.py b/netforce_clinic/models/matching_hdcase.py
index dd4132f..436c7f3 100644
--- a/netforce_clinic/models/matching_hdcase.py
+++ b/netforce_clinic/models/matching_hdcase.py
@@ -10,6 +10,7 @@ class MatchingHDCase(Model):
     _fields={
         "date": fields.Date("Date", required=True),
         'file': fields.File("File"),
+        'state': fields.Selection([["match","Math"],["not_match","Not Match"]],"State"),
     }
     
     def _get_date(self,context={}):
@@ -58,8 +59,10 @@ class MatchingHDCase(Model):
         hdcases={}
         date=time.strftime("%Y-%m-%d")
         lines=[]
+        state="all"
         if ids:
             obj=self.browse(ids)[0]
+            state=obj.state
             date=obj.date
             if obj.file:
                 fpath=get_file_path(obj.file)
@@ -174,6 +177,11 @@ class MatchingHDCase(Model):
                         'prod_id': prod_id,
                         'fee_amt': fee_amt,
                         'note': '',
+                        'nf_date': '',
+                        'nf_hn': '',
+                        'nf_hct': '',
+                        'nf_epo': '',
+                        'nf_fee': '',
                     }
                     if hdcase:
                         line_vals['is_match']=True
@@ -186,11 +194,24 @@ class MatchingHDCase(Model):
                             line_vals['is_match']=False
                             line_vals['hd_case_id']=hdcase2['id']
                             line_vals['hd_case_number']=hdcase2['number']
-                            line_vals['note']=hdcase2['note']
+                            line_vals['note']=''
+                            nf_date,nf_hn,nf_hct,nf_epo,nf_fee=hdcase2['note'].split(",")
+                            line_vals['nf_date']=nf_date
+                            line_vals['nf_hn']=nf_hn
+                            line_vals['nf_hct']=nf_hct
+                            line_vals['nf_epo']=nf_epo
+                            line_vals['nf_fee']=round(float((nf_fee or "0")),2)
                     lines.append(line_vals)
         no=1
         lines2=[]
         for line in sorted(lines,key=lambda x: x['hn']):
+            is_match=line.get('is_match',False)
+            if state=='not_match' and is_match:
+                continue
+            elif state=='match' and not is_match:
+                continue
+            else:
+                pass
             line['no']=no
             lines2.append(line)
             no+=1
diff --git a/netforce_clinic/models/matching_payment.py b/netforce_clinic/models/matching_payment.py
index 86e3ef0..046bf3f 100644
--- a/netforce_clinic/models/matching_payment.py
+++ b/netforce_clinic/models/matching_payment.py
@@ -80,7 +80,7 @@ class MatchingPayment(Model):
             raise Exception("No data to match") 
         return lines
 
-    def match(self,ids,context={}):
+    def match_old(self,ids,context={}):
         obj=self.browse(ids)[0]
         lines=obj.get_line()
 
@@ -88,6 +88,7 @@ class MatchingPayment(Model):
         db.execute("truncate m2m_clinic_hd_case_expense_clinic_matching_payment;")
         matches1={}
         matches2={}
+        matches3={}
         if obj.pcode=='SSO':
             for line in lines:
                 hcode=line.get('hcode18')
@@ -101,6 +102,7 @@ class MatchingPayment(Model):
                     lmdc_amt=line.get('allow37') or 0
                     dttran=line.get("dttran")
                     name=line.get("name14")
+                    pid=line.get('pid')
                     date=dttran[0:10]
                     time=dttran[11:] #XXX
                     if not time:
@@ -116,16 +118,33 @@ class MatchingPayment(Model):
                         lmdc_amt,
                         )
                     key2='%s:%s:%s:%s:%s'%(
+                        pid,
+                        date,
+                        lfee_amt,
+                        lsrv_amt,
+                        lmdc_amt,
+                        )
+                    key3='%s:%s:%s:%s:%s'%(
                         name,
                         date,
                         lfee_amt,
                         lsrv_amt,
                         lmdc_amt,
                         )
+                    vals={
+                        'pid': pid,
+                        'name': name,
+                        'date': date,
+                        'fee_amt': lfee_amt,
+                        'service_amt': lsrv_amt,
+                        'epo_amt': lmdc_amt,
+                    }
                     if not matches1.get(key1):
-                        matches1[key1]=0
+                        matches1[key1]=vals
                     if not matches2.get(key2):
-                        matches2[key2]=0
+                        matches2[key2]=vals
+                    if not matches3.get(key3):
+                        matches2[key2]=vals
 
         elif obj.pcode=='UC':
             for line in lines:
@@ -156,13 +175,6 @@ class MatchingPayment(Model):
                     matches1[key1]={
                        'invno': line['invno'], 
                     }  
-        #print("="*50)
-        #for key, values in matches1.items():
-            #x=key.split("-")
-            #hn=x[0]
-            #if hn=='11712556':
-                #print(key) 
-        #print("="*50)
         note=""
         exp_ids=[]
         dom=[]
@@ -182,8 +194,6 @@ class MatchingPayment(Model):
                     if categ.code=='FEE':
                         fee_amt+=line.amount or 0
                 key='%s-%s-%s'%(pt.hn_no,date,amt)
-                #if pt.hn_no=='11712556':
-                    #print('key ', key)
                 found=matches1.get(key)
                 if found:
                    exp.write({
@@ -236,6 +246,191 @@ class MatchingPayment(Model):
             'flash': flash,
         }
 
+    def match(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        lines=obj.get_line()
+        return lines
+
+        matches1={}
+        matches2={}
+        matches3={}
+        dom=[]
+        dom.append(['date',">=",obj.date_from])
+        dom.append(['date',"<=",obj.date_to])
+        dom.append(['patient_id.type_id',"=",obj.patient_type_id.id])
+        dom.append(['state','!=', 'completed'])
+        for exp in get_model('clinic.hd.case.expense').search_browse(dom):
+            hn=''.join([x for x in hn if x.isdigit()])
+            key1='%s:%s:%s:%s:%s'%(
+                hn,
+                date,
+                lfee_amt,
+                lsrv_amt,
+                lmdc_amt,
+                )
+            key2='%s:%s:%s:%s:%s'%(
+                pid,
+                date,
+                lfee_amt,
+                lsrv_amt,
+                lmdc_amt,
+                )
+            key3='%s:%s:%s:%s:%s'%(
+                name,
+                date,
+                lfee_amt,
+                lsrv_amt,
+                lmdc_amt,
+                )
+            vals={
+                'pid': pid,
+                'name': name,
+                'date': date,
+                'fee_amt': lfee_amt,
+                'service_amt': lsrv_amt,
+                'epo_amt': lmdc_amt,
+            }
+            if not matches1.get(key1):
+                matches1[key1]=vals
+            if not matches2.get(key2):
+                matches2[key2]=vals
+            if not matches3.get(key3):
+                matches2[key2]=vals
+        if obj.pcode=='SSO':
+            for line in lines:
+                hcode=line.get('hcode18')
+                if not hcode:
+                    hcode='0'
+                hcode=int(hcode)
+                hcode=str(hcode)
+                if obj.hcode==hcode:
+                    lsrv_amt=line.get('epoadm29') or 0
+                    lfee_amt=line.get('amount23') or 0
+                    lmdc_amt=line.get('allow37') or 0
+                    dttran=line.get("dttran")
+                    name=line.get("name14")
+                    pid=line.get('pid')
+                    date=dttran[0:10]
+                    time=dttran[11:] #XXX
+                    if not time:
+                        print("wrong format")
+                        continue
+                    hn=line.get('hn')
+                    hn=''.join([x for x in hn if x.isdigit()])
+                    key1='%s:%s:%s:%s:%s'%(
+                        hn,
+                        date,
+                        lfee_amt,
+                        lsrv_amt,
+                        lmdc_amt,
+                        )
+                    key2='%s:%s:%s:%s:%s'%(
+                        pid,
+                        date,
+                        lfee_amt,
+                        lsrv_amt,
+                        lmdc_amt,
+                        )
+                    key3='%s:%s:%s:%s:%s'%(
+                        name,
+                        date,
+                        lfee_amt,
+                        lsrv_amt,
+                        lmdc_amt,
+                        )
+                    vals={
+                        'pid': pid,
+                        'name': name,
+                        'date': date,
+                        'fee_amt': lfee_amt,
+                        'service_amt': lsrv_amt,
+                        'epo_amt': lmdc_amt,
+                    }
+                    if not matches1.get(key1):
+                        matches1[key1]=vals
+                    if not matches2.get(key2):
+                        matches2[key2]=vals
+                    if not matches3.get(key3):
+                        matches2[key2]=vals
+
+        elif obj.pcode=='UC':
+            for line in lines:
+                #{'amount': '1500.0000',
+                 #'cstat': None,
+                 #'dttran': '2014-09-27T10:00:00',
+                 #'epostat': 'E',
+                 #'hdflag': 'COU',
+                 #'hdrate': '1500.0000',
+                 #'hn': '98511252',
+                 #'hreg': 'NHSO1',
+                 #'invno': '437941480',
+                 #'paid': '0.0000',
+                 #'paychk': '1',
+                 #'reimbpay': '0.0000',
+                 #'rid': '2190',
+                 #'station': '01'}
+                date,time=(line['dttran'] or "").split("T")
+                amt=line['amount'] or "0"
+                amt=float(amt)
+                if date and time:
+                    key1='%s-%s-%s'%(
+                        line['hn'],
+                        date,
+                        amt,
+                    )
+                if not matches1.get(key1):
+                    matches1[key1]={
+                       'invno': line['invno'], 
+                    }  
+
+        for exp in get_model('clinic.hd.case.expense').search_browse(dom):
+            pt=exp.patient_id
+            if obj.pcode=='UC':
+                hdcase=exp.hd_case_id
+                date=hdcase.date
+                fee_amt=0
+                for line in hdcase.lines:
+                    categ=line.product_categ_id
+                    if categ.code=='FEE':
+                        fee_amt+=line.amount or 0
+                key='%s-%s-%s'%(pt.hn_no,date,amt)
+                found=matches1.get(key)
+                if found:
+                   exp.write({
+                       'state': 'match',
+                   })  
+            elif obj.pcode=='SSO':
+                key1='%s:%s:%s:%s:%s'%(
+                    pt.hn_no,
+                    exp.date,
+                    exp.fee_amt and exp.fee_amt or 0,
+                    exp.srv_amt and exp.srv_amt or 0,
+                    exp.mdc_amt and exp.mdc_amt or 0,
+                    )
+                key2='%s:%s:%s:%s:%s'%(
+                    pt.name or "",
+                    exp.date,
+                    exp.fee_amt and exp.fee_amt or 0,
+                    exp.srv_amt and exp.srv_amt or 0,
+                    exp.mdc_amt and exp.mdc_amt or 0,
+                    )
+                found=matches1.get(key1) or matches2.get(key2)
+                if found:
+                    hdcase=exp.hd_case_id
+                    exp.write({
+                        'state': 'match',
+                    })  
+
+        flash='Done!'
+        return {
+            'next': {
+                'name': 'clinic_matching_payment',
+                'mode': 'form',
+                'active_id': obj.id,
+            },
+            'flash': flash,
+        }
+
     def onchange_date(self,context={}):
         data=context['data']
         date=data['date']
@@ -330,4 +525,12 @@ class MatchingPayment(Model):
                 })
         print("Done!")
 
+    def get_report_data(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        lines=obj.match()
+        data={
+            'lines': lines,
+        }
+        return data
+
 MatchingPayment.register()
diff --git a/netforce_clinic/reports/matching_hdcase.xlsx b/netforce_clinic/reports/matching_hdcase.xlsx
index 33e8a9a7155b67b56786ffd8b2f2ea4fd8dce427..95a801913095039b5648a33bfda07b540ac311c7 100644
GIT binary patch
delta 3183
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
O*^!}~Vzf7Yul^758q>@G

delta 2624
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

diff --git a/netforce_clinic/reports/matching_payment.xlsx b/netforce_clinic/reports/matching_payment.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..33e8a9a7155b67b56786ffd8b2f2ea4fd8dce427
GIT binary patch
literal 5023
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
VKV1z%!1+TY*q1zZf7E|Y`ak`GTtNT;

literal 0
HcmV?d00001

diff --git a/netforce_clinic/templates/matching_hdcase.hbs b/netforce_clinic/templates/matching_hdcase.hbs
index 7b13dff..cb778fc 100644
--- a/netforce_clinic/templates/matching_hdcase.hbs
+++ b/netforce_clinic/templates/matching_hdcase.hbs
@@ -1,5 +1,14 @@
+<center>
+    &nbsp;
+</center>
+<!--<table class="table table-bordered">-->
 <table class="table table-condensed table-striped">
     <thead>
+        <tr>
+            <th colspan="9" style="text-align:center;background-color:#f9e37d;">Import File</th>
+            <th colspan="5" style="text-align:center;background-color:#2d6ed2;color:white">Netforce</th>
+        </tr>
+        <tr>
         <th>#</th>
         <th>Date</th>
         <th>HN</th>
@@ -7,10 +16,16 @@
         <th>Type</th>
         <th>HCT</th>
         <th>EPO</th>
-        <th>Fee Amount</th>
-        <th>HD Case</th>
-        <th>Note (fmt: date,hn,hct,epo,fee)</th>
+        <th>Fee</th>
+        <th>Match</th>
+        <th>Date</th>
+        <th>HN</th>
+        <th>HCT</th>
+        <th>EPO</th>
+        <th>Fee</th>
+        </tr>
     </thead>
+
     <tbody>
         {{#each lines }}
                 <tr>
@@ -39,10 +54,15 @@
                             <a style="color:white" href="/ui#name=clinic_hd_case&mode=form&active_id={{hd_case_id}}">{{hd_case_number}}</a>
                         </td>
                     {{/if}}
-                    <td>{{note}}</td>
+                    <td>{{nf_date}}</td>
+                    <td>{{nf_hn}}</td>
+                    <td>{{nf_hct}}</td>
+                    <td>{{nf_epo}}</td>
+                    <td>{{currency nf_fee zero=""}}</td>
                 </tr>
         {{/each}}
     </tbody>
     <tfoot>
     </tfoot>
 </table>
+
diff --git a/netforce_clinic/templates/matching_payment.hbs b/netforce_clinic/templates/matching_payment.hbs
new file mode 100644
index 0000000..fa213a9
--- /dev/null
+++ b/netforce_clinic/templates/matching_payment.hbs
@@ -0,0 +1,29 @@
+<table class="table table-condensed table-striped">
+    <thead>
+        <th>#</th>
+        <th>Date</th>
+        <th>HN</th>
+        <th>Patient</th>
+        <th>EPO Amount</th>
+        <th>Service Medical</th>
+        <th>Fee Amount</th>
+        <th>HD Case</th>
+        <th>Note</th>
+    </thead>
+    <tbody>
+        {{#each lines }}
+                <tr>
+                    <td>{{no}}</td>
+                    <td>{{date}}</td>
+                    <td>{{hn}}</td>
+                    <td style="width:15%;">{{view "link" string=patient_name action="clinic_patient" action_options="mode=form" active_id=patient_id}}</td>
+                    <td>{{currency epo_amt zero=""}}</td>
+                    <td>{{currency service_amt zero=""}}</td>
+                    <td>{{currency fee_amt zero=""}}</td>
+                    <td>{{note}}</td>
+                </tr>
+        {{/each}}
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index c849921..8782d4a 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,86 +1,5 @@
 todo:
-    - report doctor & nurse ***
     - matching payment ***
         - script generate hd case
+    - report doctor & nurse ***
 
-
-    - urgent -> done:
-        - change department on user profile -> ok
-            - Because of one user can access more than branch
-    - move between branch -> next phase
-        - patient
-    - sale medicine -> ok
-        - payment 
-    - accounting
-        - labor cost
-            - report ->ok
-                - nurse
-                    - max cycle
-                - doctor
-                    - total hd case
-        - invoice line -> account -> credit
-        - if user select product by them self -> testing
-            - credit <= product -> tab -> accounting -> sale -> sale account
-            - debit <= 1. contact -> tab accounting -> account receiaveble , 2. finacial setting ->  account receiable
-    - patient
-        - link vascular access to patient profile and copy to hd case after confirm on visit  -> ok
-            - can update date from hd case to patient
-    - hd case
-        - move membrane type to dialyzer -> ok
-        - make script to update membran type -> ok
-        - add option -> ok
-            - new shop
-                - related to hd case
-
-    - filter product by
-        1. company -> ok
-        2. category -> ok
-        3. code -> ok
-    - cycle item
-        - copy nurse only in the list -> ok
-        - problem after confirm visit -> ok
-            
-   - import hd case ***
-        - add script
-   - report 
-      - doctor labort cost detail ***
-        - how much hd of that doctor in that period
-        - working status 
-   - matching payment ***
-
-   - show image of staff -> 
-   - popup messagging -> Ask DK -> ok
-   - modify message of log -> Ask DJ -> ok
-   - copy old nurse from previous cycle item -> ok
-   - multi confirm on visit board **** -> ok
-=======
-    generate visit ใหม่ -> ok
-    popup select dyalyzer -> ok
-        - visit
-            - confirm: if pt has dialyzer -> auto select else empty (need to select on hd case)
-            
-    - click pay -> cash -> not update use time (dlz) -> ok
-    - reset use time after hd case is done! -> ok
-
-=======
-sharing setting
-    - filter by branch
-        - patient -> ok
-        - staff -> not yet
-             - nurse ยังไม่มีรายชื่อสาขาที่เขาเลือก -> ok
-             - doctor ยังไม่ match ก้ับคนไข้ ****
-        - visit -> ok
-        - hd case ->  ok
-        - cycle item -> ok
-        - department -> ok
-        - sickbed ->  ok
-        - schedule -> ok
-        - dialyser -> ok
-
-
-user:
-    - update hd case
-
-link:
-    clinic.rddialysis.co.th
-    test.rddialysis.co.th

Import File									Netforce
#	Date	HN	Type	HCT	EPO	Fee Amount	HD Case	Note (fmt: date,hn,hct,epo,fee)	Fee	Match	Date	HN	HCT	EPO	Fee
{{note}}	{{nf_date}}	{{nf_hn}}	{{nf_hct}}	{{nf_epo}}	{{currency nf_fee zero=""}}