From e203358be3d68aafc1feee606dbb70240beadf2d Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Wed, 4 Mar 2015 14:19:53 +0700
Subject: [PATCH] filter matching payment

---
 .../actions/clinic_matching_payment_popup.xml |   6 ++
 .../layouts/clinic_cust_invoice_form.xml      |   3 +-
 .../layouts/clinic_matching_payment_form.xml  |  70 +++++++++++++-----
 .../layouts/clinic_matching_payment_popup.xml |   9 +++
 netforce_clinic/models/__init__.py            |   1 +
 netforce_clinic/models/account_invoice.py     |   2 +
 netforce_clinic/models/hd_case.py             |   5 ++
 netforce_clinic/models/matching_payment.py    |  59 +++++++++++----
 .../models/matching_payment_popup.py          |  39 ++++++++++
 .../matching_payment_invoice_unmatch.xlsx     | Bin 4766 -> 4921 bytes
 netforce_clinic/todo.txt                      |  21 +++---
 11 files changed, 169 insertions(+), 46 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_matching_payment_popup.xml
 create mode 100644 netforce_clinic/layouts/clinic_matching_payment_popup.xml
 create mode 100644 netforce_clinic/models/matching_payment_popup.py
diff --git a/netforce_clinic/actions/clinic_matching_payment_popup.xml b/netforce_clinic/actions/clinic_matching_payment_popup.xml
new file mode 100644
index 0000000..82416b9
--- /dev/null
+++ b/netforce_clinic/actions/clinic_matching_payment_popup.xml
@@ -0,0 +1,6 @@
+<action>
+    <field name="string">Select</field>
+    <field name="view_cls">form_popup</field>
+    <field name="model">clinic.matching.payment.popup</field>
+    <field name="target">_popup</field>
+</action>
diff --git a/netforce_clinic/layouts/clinic_cust_invoice_form.xml b/netforce_clinic/layouts/clinic_cust_invoice_form.xml
index 8667d88..f185557 100644
--- a/netforce_clinic/layouts/clinic_cust_invoice_form.xml
+++ b/netforce_clinic/layouts/clinic_cust_invoice_form.xml
@@ -1,5 +1,6 @@
 <inherit model="account.invoice" inherit="cust_invoice_form">
     <field name="related_id" position="before">
-        <field name="department_id"/>
+        <field name="department_id" span="2"/>
+        <field name="patient_partner_id" span="2"/>
     </field>
 </inherit>
diff --git a/netforce_clinic/layouts/clinic_matching_payment_form.xml b/netforce_clinic/layouts/clinic_matching_payment_form.xml
index cb6f5b6..e01e9b6 100644
--- a/netforce_clinic/layouts/clinic_matching_payment_form.xml
+++ b/netforce_clinic/layouts/clinic_matching_payment_form.xml
@@ -2,14 +2,13 @@
     <head>
         <field name="state"/>
         <button string="Print" dropdown="1" icon="print">
-            <item string="Match" method="print_match"/>
-            <item string="Unmatch" method="print_unmatch"/>
             <item string="Invoice Unmatch" action="clinic_matching_payment_unmatch_invoice"/>
         </button>
         <button string="Options" dropdown="1">
-            <item string="Update Identification" method="update_id"/>
             <item string="To Draft" method="to_draft" states="approved"/>
-            <item string="Clear" method="clear_line" confirm="Are you sure?"/>
+            <item string="Select Type" action="clinic_matching_payment_popup"/>
+            <item string="Update ID Card" method="update_id"/>
+            <item string="Reset Items" method="clear_line" confirm="Are you sure?"/>
         </button>
     </head>
     <field name="date" onchange="onchange_date" mode="month" span="3"/>
@@ -21,22 +20,57 @@
     <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="type" invisible="1" span="3"/>
     <tabs>
         <tab string="General">
-            <field name="lines" nolabel="1" count="0">
-                <list>
-                    <field name="date"/>
-                    <field name="hn"/>
-                    <field name="pid"/>
-                    <field name="name"/>
-                    <field name="epo" sum="1"/>
-                    <field name="srv" sum="1"/>
-                    <field name="fee" sum="1"/>
-                    <field name="amount" sum="1"/>
-                    <field name="invoice_id" onchange="onchange_invoice" domain='[["date","=",date],["state","=","waiting_payment"]]'/>
-                    <field name="state"/>
-                </list> 
-            </field>
+            <group attrs='{"invisible":[["type","in",["match","unmatch"]]]}'>
+                <field name="lines" nolabel="1" count="0">
+                    <list>
+                        <field name="date"/>
+                        <field name="hn"/>
+                        <field name="pid"/>
+                        <field name="name"/>
+                        <field name="epo" sum="1"/>
+                        <field name="srv" sum="1"/>
+                        <field name="fee" sum="1"/>
+                        <field name="amount" sum="1"/>
+                        <field name="invoice_id" onchange="onchange_invoice" domain='[["date","=",date],["state","=","waiting_payment"]]'/>
+                        <field name="state"/>
+                    </list> 
+                </field>
+            </group>
+            <group attrs='{"invisible":[["type","in",["all","match"]]]}'>
+                <field name="unmatch_lines" nolabel="1" count="0">
+                    <list>
+                        <field name="date"/>
+                        <field name="hn"/>
+                        <field name="pid"/>
+                        <field name="name"/>
+                        <field name="epo" sum="1"/>
+                        <field name="srv" sum="1"/>
+                        <field name="fee" sum="1"/>
+                        <field name="amount" sum="1"/>
+                        <field name="invoice_id" onchange="onchange_invoice" domain='[["date","=",date],["state","=","waiting_payment"]]'/>
+                        <field name="state"/>
+                    </list> 
+                </field>
+            </group>
+            <group attrs='{"invisible":[["type","in",["all","unmatch"]]]}'>
+                <field name="match_lines" nolabel="1" count="0">
+                    <list>
+                        <field name="date"/>
+                        <field name="hn"/>
+                        <field name="pid"/>
+                        <field name="name"/>
+                        <field name="epo" sum="1"/>
+                        <field name="srv" sum="1"/>
+                        <field name="fee" sum="1"/>
+                        <field name="amount" sum="1"/>
+                        <field name="invoice_id" onchange="onchange_invoice" domain='[["date","=",date],["state","=","waiting_payment"]]'/>
+                        <field name="state"/>
+                    </list> 
+                </field>
+            </group>
             <group span="8" columns="1">
                 <field name="total_srv" offset="1" span="3"/>
                 <newline/>
diff --git a/netforce_clinic/layouts/clinic_matching_payment_popup.xml b/netforce_clinic/layouts/clinic_matching_payment_popup.xml
new file mode 100644
index 0000000..1a2e4d3
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_matching_payment_popup.xml
@@ -0,0 +1,9 @@
+<form model="clinic.matching.payment.popup" title="Select Type">
+    <group form_layout="stacked">
+        <field name="type" span="6"/>
+        <field name="matching_payment_id" invisible="1"/>
+    </group>
+    <foot>
+        <button string="Select" method="do_select" type="primary"/>
+    </foot>
+</form>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 41689fa..69c0b11 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -104,6 +104,7 @@ from . import make_apt
 from . import make_apt_line
 from . import matching_payment
 from . import matching_payment_line
+from . import matching_payment_popup
 from . import invoice_payment
 from . import invoice_payment_line
 from . import matching_hdcase
diff --git a/netforce_clinic/models/account_invoice.py b/netforce_clinic/models/account_invoice.py
index 9415185..a7d05eb 100644
--- a/netforce_clinic/models/account_invoice.py
+++ b/netforce_clinic/models/account_invoice.py
@@ -7,6 +7,8 @@ class AccountInvoice(Model):
     _fields={
         'clinic_expense_id': fields.Many2One("clinic.hd.case.expense","Expense"),
         'department_id': fields.Many2One("clinic.department","Department",search=True),
+        'patient_partner_id': fields.Many2One("partner","Patient",search=True),
     }
     
+
 AccountInvoice.register()
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 874024f..8f24120 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -506,6 +506,7 @@ class HDCase(Model):
                 }))
         
         patient=obj.patient_id
+        patient_partner=patient.partner_id
 
         if rmb_lines:
             ptype=patient.type_id
@@ -528,6 +529,8 @@ class HDCase(Model):
             }
             vals["partner_id"]=partner.id
             vals['lines']=rmb_lines
+            if patient_partner:
+                vals['patient_partner_id']=patient_partner.id,
             get_model("account.invoice").create(vals,context)
 
         if normb_lines and is_credit:
@@ -548,6 +551,8 @@ class HDCase(Model):
                 'partner_id':partner.id,
             }
             vals['lines']=normb_lines
+            if patient_partner:
+                vals['patient_partner_id']=patient_partner.id,
             get_model("account.invoice").create(vals,context) # create alway
 
         obj.make_pickings()
diff --git a/netforce_clinic/models/matching_payment.py b/netforce_clinic/models/matching_payment.py
index fc58422..b66c21a 100644
--- a/netforce_clinic/models/matching_payment.py
+++ b/netforce_clinic/models/matching_payment.py
@@ -10,7 +10,6 @@ from . import utils
 class MatchingPayment(Model):
     _name="clinic.matching.payment"
     _string="Payment Matching"
-    #_transient=True
 
     def _get_store(self,ids,context={}):
         res={}
@@ -28,9 +27,13 @@ class MatchingPayment(Model):
             total_fee=0
             total_srv=0
             total_epo=0
-            for line in obj.lines:
-                if line.state!='match':
-                    continue
+            otype=obj.type or "all"
+            lines=obj.lines
+            if otype=='match':
+                lines=obj.match_lines
+            elif otype=='unmatch':
+                lines=obj.unmatch_lines
+            for line in lines:
                 total_fee+=line.fee or 0
                 total_srv+=line.srv or 0
                 total_epo+=line.epo or 0
@@ -38,9 +41,9 @@ class MatchingPayment(Model):
                 if state=='match':
                     total_match+=1
             res[obj.id]={
-                'total': len(obj.lines),
+                'total': len(lines),
                 'total_match': total_match,
-                'total_unmatch': len(obj.lines)-total_match,
+                'total_unmatch': len(lines)-total_match,
                 'total_fee': total_fee,
                 'total_srv': total_srv,
                 'total_epo': total_epo,
@@ -58,6 +61,8 @@ class MatchingPayment(Model):
         'pcode': fields.Char("Code",required=True),
         'hcode_id': fields.Many2One("clinic.hospital","HCode"),
         'lines': fields.One2Many("clinic.matching.payment.line","match_id", "Lines"),
+        'match_lines': fields.One2Many("clinic.matching.payment.line","match_id", "Lines",domain=[['state','=','match']]),
+        'unmatch_lines': fields.One2Many("clinic.matching.payment.line","match_id", "Lines",domain=[['state','=','unmatch']]),
         'note': fields.Text("Note"),
         'total': fields.Integer("Total",function="_get_all",function_multi=True),
         'total_match': fields.Integer("Match",function="_get_all",function_multi=True),
@@ -66,6 +71,7 @@ class MatchingPayment(Model):
         'total_srv': fields.Float("Service",function="_get_all",function_multi=True),
         'total_epo': fields.Float("EPO",function="_get_all",function_multi=True),
         '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"),
     }
     
@@ -102,6 +108,7 @@ class MatchingPayment(Model):
         'pcode': _get_pcode,
         'state': 'draft',
         'user_id': lambda *a: get_active_user(),
+        'type': 'all',
     }
     _order="date desc"
 
@@ -517,16 +524,36 @@ class MatchingPayment(Model):
     def get_data(self,context={}):
         ref_id=int(context.get("refer_id","0"))
         obj=self.browse(ref_id)
-        dom=[]
-        dom.append(['date','>=',obj.date_from])
-        dom.append(['date','<=',obj.date_to])
-        for invoice in get_model("account.invoice").search_browse(dom):
-            pass
-        match_ids=[]
+        inv_match_ids=[]
         for line in obj.lines:
-            pass
-        print("name ", obj.name)
-        data={}
+            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 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={
+            'lines': lines,
+            'date_from': obj.date_from,
+            'date_to': obj.date_to,
+        }
         return data
 
     def print_invoice_unmatch(self,ids,context={}):
@@ -537,7 +564,7 @@ class MatchingPayment(Model):
                 'mode': 'form',
                 'active_id': obj.id,
             },
-            'flash': 'TODO',
+            #'flash': 'TODO',
         }
 
 MatchingPayment.register()
diff --git a/netforce_clinic/models/matching_payment_popup.py b/netforce_clinic/models/matching_payment_popup.py
new file mode 100644
index 0000000..8a6faf2
--- /dev/null
+++ b/netforce_clinic/models/matching_payment_popup.py
@@ -0,0 +1,39 @@
+from netforce.model import Model, fields, get_model
+
+class MatchingPaymentPopup(Model):
+    _name="clinic.matching.payment.popup"
+    _transient=True
+
+    _fields={
+        "matching_payment_id": fields.Many2One("clinic.matching.payment","Matching Payment",required=True,on_delete="cascade"),
+        'type': fields.Selection([['all','All'],['match','Match'],['unmatch','Not Match']],'Type'),
+    }
+    
+    def _get_id(self,context={}):
+        refer_id=context.get("refer_id")
+        if not refer_id:
+            return None
+        return int(refer_id)
+
+    _defaults={
+        'matching_payment_id': _get_id,
+        'type': 'all',
+    }
+
+    def do_select(self,ids,context):
+        obj=self.browse(ids)[0]
+        matching=obj.matching_payment_id
+        matching.write({
+            'type': obj.type,
+        })
+        return {
+            'next': {
+                'name': 'clinic_matching_payment',
+                'mode': 'form',
+                'active_id': matching.id,
+            },
+        }
+
+
+MatchingPaymentPopup.register()
+
diff --git a/netforce_clinic/reports/matching_payment_invoice_unmatch.xlsx b/netforce_clinic/reports/matching_payment_invoice_unmatch.xlsx
index dfd255c0dd2a66080000a194667ce99177a0dde3..650548873c85a91b2469e04cf776094ddc932598 100644
GIT binary patch
delta 2537
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
OM~bR|Sx3YO0Q?VawPHm8

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

diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 62ae521..c03c81d 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,16 +1,15 @@
 todo:
-    - report k. boy (sub detail) -> ok
-        - need to update level of nurse (Chanon)
-    - staff rotation
-        - update level for staff
-            - add script to
     - multi department access ***
-    - merge staff same name but different department
-        - doctor นายแพทย์ ทวีชัย
-    - ** udpate server (run click me)
-    - ** update accounting
-        - bug
-        - wht (david)
+        - merge staff same name but different department
+            - doctor นายแพทย์ ทวีชัย
+    - run script
+        - update level's nurse 
+        - report k. boy (sub detail) -> ok
+    - ** update accounting 
+        - link ref -> ok
+        - bug -> ok
+        - wht (david) -> p yui test
+
 ===============================
 
     - compute labor cost
