From 9bba8a3401d42ff8a88e2eeed4ad63194b5b0e22 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Fri, 24 Apr 2015 15:35:57 +0700
Subject: [PATCH] fix account report

---
 .../models/report_account_hd_case_summary.py  |  92 ++++++++++--------
 .../report_account_hd_case_summary.xlsx       | Bin 5846 -> 7474 bytes
 .../report_account_hd_case_summary.hbs        |  16 ++-
 3 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/netforce_clinic/models/report_account_hd_case_summary.py b/netforce_clinic/models/report_account_hd_case_summary.py
index bfab66b..76a7016 100644
--- a/netforce_clinic/models/report_account_hd_case_summary.py
+++ b/netforce_clinic/models/report_account_hd_case_summary.py
@@ -110,27 +110,28 @@ class ReportAccountHDCaseSummary(Model):
         records={}
         cycles={}
         context['reimbursable']=reimbursable
+        categ_prods=[]
+        for cat_prod in get_model("product.categ").search_read([],['code']):
+            code=(cat_prod['code'] or "").lower()
+            categ_prods.append(code)
         for line in get_model("clinic.hd.case.line").search_browse(dom,context=context):
             hdcase=line.hd_case_id
-            items={}
-            amt=line.amount or 0
-            categ=line.product_categ_id
-            code=(categ.code or "").lower()
-            if not code in items.keys():
-                items[code]=[]
-            items[code].append({
-                'amount': amt,
-            })
-            pm_number=','.join([pm.number for pm in hdcase.payments if pm.number])
+            pm_numbers=[]
+            pm_id=None
+            for pm in hdcase.payments:
+                if pm.number:
+                    pm_numbers.append(pm.number)
+                    pm_id=pm.id #XXX
+            pm_number=','.join([pnum for pnum in pm_numbers])
             prods={
                 'yes': [],
                 'no': [],
                 '': [],
             }
             #get the right invoice
-            for line in hdcase.lines:
-                prod=line.product_id
-                reim=line.reimbursable
+            for hline in hdcase.lines:
+                prod=hline.product_id
+                reim=hline.reimbursable
                 if prod:
                     prods[reim].append(prod.id)
             inv_number=""
@@ -138,8 +139,8 @@ class ReportAccountHDCaseSummary(Model):
             inv_id=None
             for inv in hdcase.invoices:
                 inv_prods=[]
-                for line in inv.lines:
-                    prod=line.product_id
+                for inv_line in inv.lines:
+                    prod=inv_line.product_id
                     if prod:
                         if prod.id in prods[reimbursable]:
                             inv_prods.append(prod.id)
@@ -158,15 +159,15 @@ class ReportAccountHDCaseSummary(Model):
             cycle_item=hdcase.cycle_item_id
             if cycle.id not in cycles.keys():
                 cycles[cycle.id]=[]
-                for line in cycle_item.lines:
-                    nurse=line.nurse_id
+                for cline in cycle_item.lines:
+                    nurse=cline.nurse_id
                     cycles[cycle.id].append(nurse.name)
             vals={
                 'hdcase_id': hdcase.id,
                 'number': hdcase.number or "",
                 'date':  hdcase.date,
                 'hct': hdcase.hct or 0,
-                'epo_name': hdcase.epo or 0,
+                'epo_name': hdcase.epo or "",
                 'ptype': ptype.name or "",
                 'ptype_color': ptype.color or "default",
                 'dname': hdcase.doctor_id.name or "",
@@ -177,39 +178,44 @@ class ReportAccountHDCaseSummary(Model):
                 'idcard': patient.card_no or "",
                 'cseq': cycle.sequence or 0,
                 'cycle_item_id': cycle_item.id,
-                'pm_number': pm_number and pm_number or "-",
-                'inv_number': inv_number and inv_number or "-",
+                'pm_number': pm_number and pm_number or "",
+                'pm_id': pm_id,
+                'inv_number': inv_number and inv_number or "",
                 'inv_id': inv_id,
-                'mdc': hdcase.mdc,
                 'mdc_name': hdcase.mdc_name,
                 'dlz_name': hdcase.dlz_name,
                 'dlz_id': hdcase.dlz_id and hdcase.dlz_id or 0,
-                'dlz_price': hdcase.dlz_price,
-                'lab': hdcase.lab,
-                'misc': hdcase.misc,
-                'inv_ref': inv_ref and inv_ref or "-",
-                'pick_ref': pick_ref and pick_ref or "-",
+                'inv_ref': inv_ref and inv_ref or "",
+                'pick_ref': pick_ref and pick_ref or "",
                 'pick_id': pick_id,
             }
-            for code, item in items.items():
-                vals.update({
-                    code: sum([t['amount'] for t in item])
-                })
             # merge 1 line of number
-            number=vals['number']
-            if number not in records.keys():
-                records[number]=vals
-            #FIXME please check 
-            #else:
-                #for code, item in items.items():
-                    #if vals.get(code):
-                        #if not records[number].get(code):
-                            #records[number][code]=0
-                        #records[number][code]+=vals[code]
-                #records[number]['lab']+=vals['lab']
-                #records[number]['misc']+=vals['misc']
+            hdcase_id=vals['hdcase_id']
+            if not records.get(hdcase_id):
+                for categ_prod in categ_prods:
+                    vals[categ_prod]=0
+                vals['misc']=0
+                records[hdcase_id]=vals
+            amt=line.amount or 0
+            print('reimbursable ', line.reimbursable)
+            categ=line.product_categ_id
+            if categ:
+                code=(categ.code or "").lower()
+                if code:
+                    code=code.replace("epo","mdc") #XXX
+                    records[hdcase_id][code]+=amt
+                else:
+                    if categ.parent_id:
+                        code=categ.parent_id.code or '' 
+                        if code:
+                            code=code.lower()
+                            records[hdcase_id][code]+=amt
+                        else:
+                            records[hdcase_id]['misc']+=amt
+            else:
+                records[hdcase_id]['misc']+=amt
         lines=[]
-        for hdnumber, vals in records.items():
+        for hdcase_id, vals in records.items():
             lines.append(vals)
         company_name=company.name or ""
         if department_id:
diff --git a/netforce_clinic/reports/report_account_hd_case_summary.xlsx b/netforce_clinic/reports/report_account_hd_case_summary.xlsx
index 931cf909c31b3e9001da4c9e9faf13df48144543..be763ec7268c0eb46ffc400dba41e8dfc8e55163 100644
GIT binary patch
literal 7474
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

delta 4844
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
I{e9{G1E-3<EC2ui

diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs
index cfb8e7b..5a6ac69 100644
--- a/netforce_clinic/templates/report_account_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs
@@ -79,9 +79,15 @@
                     <td style="width:20%">{{hn}}</td>
                     <td style="width:20%">{{idcard}}</td>
                     <td>{{ptype}}</td>
-                    <td>{{pm_number}}</td>
                     <td>
-                        {{view "link" string=inv_number action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}}
+                        {{#if pm_id}}
+                            {{view "link" string=pm_number action="payment" action_options="mode=form" active_id=pm_id}}
+                        {{/if}}
+                    </td>
+                    <td>
+                        {{#if inv_id}}
+                            {{view "link" string=inv_number action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}}
+                        {{/if}}
                     </td>
                     <td>{{mdc_name}}</td>
                     <td>{{currency fee zero=""}}</td>
@@ -90,13 +96,13 @@
                     <td>{{currency misc zero=""}}</td>
                     <td>{{currency dlz_price zero=""}}</td>
                     <td>
-                        {{view "link" string=inv_ref action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}}
+                        {{#if inv_id}}
+                            {{view "link" string=inv_ref action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}}
+                        {{/if}}
                     </td>
                     <td>
                         {{#if pick_id}}
                             {{view "link" string=pick_ref action="pick_out" action_options="mode=form" active_id=pick_id}}
-                        {{else}}
-                            - 
                         {{/if}}
                     </td>
                 {{else}}