From 4dc53d6ae328b249445bf12c79518b233d258443 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Fri, 13 Mar 2015 07:44:12 +0700
Subject: [PATCH] add report invoice matching

---
 .../clinic_matching_payment_match_invoice.xml |   6 ++
 ...linic_matching_payment_unmatch_invoice.xml |   4 +-
 .../layouts/clinic_matching_payment_form.xml  |   1 +
 netforce_clinic/models/department.py          |   1 +
 netforce_clinic/models/matching_payment.py    |  52 +++++++++++++++++-
 .../models/report_account_hd_case_summary.py  |   4 ++
 .../reports/matching_payment_invoice.xlsx     | Bin 0 -> 4978 bytes
 .../matching_payment_invoice_unmatch.xlsx     | Bin 4921 -> 0 bytes
 .../report_account_hd_case_summary.hbs        |   2 +
 netforce_clinic/todo.txt                      |   9 +--
 10 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_matching_payment_match_invoice.xml
 create mode 100644 netforce_clinic/reports/matching_payment_invoice.xlsx
 delete mode 100644 netforce_clinic/reports/matching_payment_invoice_unmatch.xlsx
diff --git a/netforce_clinic/actions/clinic_matching_payment_match_invoice.xml b/netforce_clinic/actions/clinic_matching_payment_match_invoice.xml
new file mode 100644
index 0000000..a78664e
--- /dev/null
+++ b/netforce_clinic/actions/clinic_matching_payment_match_invoice.xml
@@ -0,0 +1,6 @@
+<action>
+    <field name="type">report_xls</field>
+    <field name="model">clinic.matching.payment</field>
+    <field name="method">get_data_match</field>
+    <field name="template">matching_payment_invoice</field>
+</action>
diff --git a/netforce_clinic/actions/clinic_matching_payment_unmatch_invoice.xml b/netforce_clinic/actions/clinic_matching_payment_unmatch_invoice.xml
index d0fbbde..60cf9e5 100644
--- a/netforce_clinic/actions/clinic_matching_payment_unmatch_invoice.xml
+++ b/netforce_clinic/actions/clinic_matching_payment_unmatch_invoice.xml
@@ -1,6 +1,6 @@
 <action>
     <field name="type">report_xls</field>
     <field name="model">clinic.matching.payment</field>
-    <field name="method">get_data</field>
-    <field name="template">matching_payment_invoice_unmatch</field>
+    <field name="method">get_data_unmatch</field>
+    <field name="template">matching_payment_invoice</field>
 </action>
diff --git a/netforce_clinic/layouts/clinic_matching_payment_form.xml b/netforce_clinic/layouts/clinic_matching_payment_form.xml
index 4bd43df..fa47254 100644
--- a/netforce_clinic/layouts/clinic_matching_payment_form.xml
+++ b/netforce_clinic/layouts/clinic_matching_payment_form.xml
@@ -2,6 +2,7 @@
     <head>
         <field name="state"/>
         <button string="Print" dropdown="1" icon="print">
+            <item string="Invoice Match" action="clinic_matching_payment_match_invoice"/>
             <item string="Invoice Unmatch" action="clinic_matching_payment_unmatch_invoice"/>
         </button>
         <button string="Options" dropdown="1">
diff --git a/netforce_clinic/models/department.py b/netforce_clinic/models/department.py
index 550fde9..b93d27c 100644
--- a/netforce_clinic/models/department.py
+++ b/netforce_clinic/models/department.py
@@ -68,6 +68,7 @@ class Department(Model):
                 'perms': perms,
                 'other_perms': [('set',other_perms)],
                 'login_company_id': get_active_company(),
+                'home_action': 'clinic_board',
             })
             print("create profile %s"%(code))
             return profile_id
diff --git a/netforce_clinic/models/matching_payment.py b/netforce_clinic/models/matching_payment.py
index a37ca75..86d6602 100644
--- a/netforce_clinic/models/matching_payment.py
+++ b/netforce_clinic/models/matching_payment.py
@@ -563,7 +563,44 @@ class MatchingPayment(Model):
         super().write(ids,vals,**kw)
         self.function_store(ids)
 
-    def get_data(self,context={}):
+    def get_data_match(self,context={}):
+        ref_id=int(context.get("refer_id","0"))
+        obj=self.browse(ref_id)
+        inv_match_ids=[]
+        for line in obj.lines:
+            invoice=line.invoice_id
+            if invoice and line.state=='match':
+                inv_match_ids.append(invoice.id)
+        dom=[
+            ['partner_id','=',obj.partner_id.id],
+            ['date', '>=', obj.date_from],
+            ['date', '<=', obj.date_to],
+            ['state','=','waiting_payment'],
+        ]
+        lines=[]
+        no=1
+        for invoice in get_model('account.invoice').search_browse(dom):
+            if invoice.id not in inv_match_ids:
+                continue
+            vals={
+                'no': no,
+                'date': invoice.date,
+                'number': invoice.number,
+                'ref': invoice.ref,
+                'amount_due': invoice.amount_due or 0,
+            }
+            lines.append(vals)
+            no+=1
+        data={
+            'ptype': obj.patient_type_id.name or "",
+            'title': 'Invoice Match',
+            'lines': lines,
+            'date_from': obj.date_from,
+            'date_to': obj.date_to,
+        }
+        return data
+
+    def get_data_unmatch(self,context={}):
         ref_id=int(context.get("refer_id","0"))
         obj=self.browse(ref_id)
         inv_match_ids=[]
@@ -592,6 +629,8 @@ class MatchingPayment(Model):
             lines.append(vals)
             no+=1
         data={
+            'ptype': obj.patient_type_id.name or "",
+            'title': 'Invoice Unmatch',
             'lines': lines,
             'date_from': obj.date_from,
             'date_to': obj.date_to,
@@ -606,7 +645,16 @@ class MatchingPayment(Model):
                 'mode': 'form',
                 'active_id': obj.id,
             },
-            #'flash': 'TODO',
+        }
+
+    def print_invoice_match(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        return {
+            'next':{
+                'name': 'clinic_matching_payment',
+                'mode': 'form',
+                'active_id': obj.id,
+            },
         }
 
 MatchingPayment.register()
diff --git a/netforce_clinic/models/report_account_hd_case_summary.py b/netforce_clinic/models/report_account_hd_case_summary.py
index 2ab0ab2..46cd7ed 100644
--- a/netforce_clinic/models/report_account_hd_case_summary.py
+++ b/netforce_clinic/models/report_account_hd_case_summary.py
@@ -83,6 +83,9 @@ class ReportAccountHDCaseSummary(Model):
         lines=[]
         for hdcase in get_model("clinic.hd.case").search_browse(dom):
             items={}
+            mdc_name=(hdcase.epo or "").split("-")
+            if mdc_name:
+                mdc_name=mdc_name[0].title()
             for line in hdcase.lines:
                 amt=line.amount or 0
                 categ=line.product_categ_id
@@ -117,6 +120,7 @@ class ReportAccountHDCaseSummary(Model):
                 'cycle_item_id': cycle_item.id,
                 'pm_number': pm_number,
                 'inv_number': inv_number,
+                'mdc_name': mdc_name,
             }
             for code, item in items.items():
                 vals.update({
diff --git a/netforce_clinic/reports/matching_payment_invoice.xlsx b/netforce_clinic/reports/matching_payment_invoice.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..e81a3b57f9eead816dca52e6887f97cfbf6a5aea
GIT binary patch
literal 4978
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

literal 0
HcmV?d00001

diff --git a/netforce_clinic/reports/matching_payment_invoice_unmatch.xlsx b/netforce_clinic/reports/matching_payment_invoice_unmatch.xlsx
deleted file mode 100644
index 650548873c85a91b2469e04cf776094ddc932598..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4921
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
aIruN}r>{*wcy<%X=||yof0lo~^1lER-5_ZI

diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs
index 3626717..94d590f 100644
--- a/netforce_clinic/templates/report_account_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs
@@ -30,6 +30,7 @@
             <th>ค่ายา</th>
             <th>ค่าฉีดยา</th>
             <th>HCT</th>
+            <th>ยา</th>
             {{#ifeq reimbursable "no"}}
                 <th>Rc.</th>
                 <th>Inv.</th>
@@ -53,6 +54,7 @@
                 <td>{{currency epo zero=""}}</td>
                 <td>{{currency srv zero=""}}</td>
                 <td>{{hct}}</td>
+                <td>{{mdc_name}}</td>
                 {{#ifeq ../reimbursable "no"}}
                     <td>{{pm_number}}</td>
                     <td>{{inv_number}}</td>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 4c2594c..0f709e2 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,7 +1,8 @@
-- sickbed -> can not see sickbed because mix patient
-    - fixme:
-        - see deparment from sickbed => hd_case => and update department of patient (manymany)
-hd case => can not click next page
+- permission
+    - sickbed -> can not see sickbed because mix patient
+        - fixme:
+            - see deparment from sickbed => hd_case => and update department of patient (manymany)
+    - hd case => can not click next page
 
 report cycle item :
     - sunanna can not see
