From 93f315a91f6c58012141d7dd32a354f44b7755a3 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Wed, 18 Mar 2015 17:35:49 +0700
Subject: [PATCH] fix

---
 netforce_clinic/models/account_payment.py     |   1 -
 netforce_clinic/models/hd_case.py             |  14 ++++++++++----
 netforce_clinic/models/import_payment.py      |   1 -
 netforce_clinic/models/report_cycle_item.py   |   7 +++++++
 .../reports/report_cycle_item.xlsx            | Bin 5176 -> 5167 bytes
 .../templates/report_cycle_item.hbs           |   6 +++++-
 netforce_clinic/todo.txt                      |  11 +++++++----
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/netforce_clinic/models/account_payment.py b/netforce_clinic/models/account_payment.py
index 1a4b701..e8f1172 100644
--- a/netforce_clinic/models/account_payment.py
+++ b/netforce_clinic/models/account_payment.py
@@ -80,7 +80,6 @@ class AccountPayment(Model):
                                 'partner_id': partner_id
                             }
                         res[account_id]['credit']+=amt
-
             settings=get_model("settings").browse(1)
             if obj.type=="in":
                 journal_id=obj.journal_id.id or settings.pay_in_journal_id.id
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 4df3ce9..4e260de 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -82,19 +82,25 @@ class HDCase(Model):
             for dlz in obj.dialyzers:
                 dz=dlz.dialyzer_id
                 dlz_id=dz.id
-                name=dz.name or ""
-                name=name.split()[-1]
+                prod=dz.product_id
+                #name=dz.name or ""
+                #name=name.split()[-1]
+                name=prod.description
                 dlz_name.append(name)
                 dlz_use+=dlz.use_time or 0
                 dlz_max+=dlz.max_use_time or 0
             dlz_name=','.join([dlz for dlz in dlz_name])
             names=[]
             fee=0
+            sign=1
+            if obj.state=='waiting_payment':
+                sign=-1
             for line in obj.lines:
                 amt=line.amount or 0
                 prod=line.product_id
                 categ=line.product_categ_id
-                if categ and prod and line.reimbursable=='yes':
+                if categ and prod:
+                #if categ and prod and line.reimbursable=='yes':
                     if categ.code=='EPO':
                         name=prod.name or ""
                         name=name.split("-") #XXX
@@ -102,7 +108,7 @@ class HDCase(Model):
                             name=name[0].title()
                         names.append(name)
                     elif categ.code=='FEE':
-                        fee+=amt
+                        fee+=amt*sign
             res[obj.id]={
                 'epo': ','.join([n for n in names]),
                 'fee': fee,
diff --git a/netforce_clinic/models/import_payment.py b/netforce_clinic/models/import_payment.py
index 358b16f..9911102 100644
--- a/netforce_clinic/models/import_payment.py
+++ b/netforce_clinic/models/import_payment.py
@@ -350,5 +350,4 @@ class ImportPayment(Model):
         data['is_uc']=is_uc
         return data
 
-
 ImportPayment.register()
diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index 734d207..c7784e0 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -92,9 +92,16 @@ class ReportCycleItem(Model):
                 cycle=hdcase.cycle_id
                 dpt=hdcase.department_id
                 dlz_use=hdcase.dlz_use or 0
+                dlz_drop=False
                 if dlz_use==hdcase.dlz_max:
                     dlz_use="%sทิ้ง"%dlz_use
+                    dlz_drop=True
+                cancel=False
+                if hdcase.state=='cancelled':
+                    cancel=True
                 lines.append({
+                   'dlz_drop': dlz_drop,
+                   'cancel': cancel,
                    'pname': patient.name or '',
                    'pid': patient.id or '',
                    'hn': patient.hn_no,
diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx
index dc677d6ee7fcf0a48b0350a56f6dbf664061e617..52d8efcc6a2250bba6c8c17ffed1c71f41129a03 100644
GIT binary patch
delta 1561
zcmY+Edo<Gx7{`B;3CnF(vn;XY)-t?P(J3#&JNIdoOYWA$s?DWImw720NtnGYEt=4A
zY9g#s2Wcp*LWosEFOl0^=92JA@9EU@&-4AB=XuWaoac|vBcuC9Dg>8x@-RSAQ4vrl
zMwO{-0<Bxk<pv=5nqb+;S<=tb$nD#<Y*r)~nb|zVEfxu#^PdU)e4LbPs`E&VUi&P@
zP7k?$!tb%(BdL#4{iG&ow-*N=R?l&Z5tqiO9CO*sBJXRh*(+L6isknjUG}uY?QIRD
z@aUZ7ogay_eq^)3&FZ9jdkG~sj}un*z8AJpK}1!+V44mHgI{!p(KB&rA!mp=ob;nt
zT40&3rU>_UuPJXjQg=)u{7(|OlUW!0<f$2fWPHF-d)fQG+~b%mN{e;77U@3WK#+HH
z>*ha0mi4cVd`tQGTo~NVO&5I`9JVwlO?r{qAdSe+>oM%&+2Cty<R>n7(oQ&OHkI_J
zSWm^6G+-*+=E3Mmx@(I^%qxL+mzK||pl0o-{S1@Jko|Mfij*6-@^QxF)p`i5D(&*i
zCng?2<CFUSZwkt%Z01V4^tWk6bO+3<;e0(P6>&nPfGA`a(E^?rX6a;~T_s40Gl)0H
z${p&-C7FMa;F|id-DtLBD*$oMbC^d_!nt0~?Tz}*x;(m|Lr3ELVEG<?NhO|l<a%Ay
z#;EPGl&9!NqZH#&xt>yl*Wv&^hO`l|UvxYC1w~diW{M@eFhcPZ@$C-VGkOO+>nrrA
zX*bk~Gg}TmW0R(QrErZK`VXMfB73zB9;32plDos8(F?Lfih3<b%7lAg(9&rfJ={`~
z+P&)>oeoRq)=u+>@FDk6v&*!X7wShboGp@YV?nxWG{OAp!JKu^1*734Fz<8ENeVLB
z+nljo)HxBJzI_lcLUuTv_FJ(G6Yr@gEo@?hzWe*rSx<I0`teBPe%U$8l0M{1TAUrZ
z1Kl6jU=)!`BPE|`wyNOr<6Z60(Aa2n<EB`8%z*g;9rzSrwIAu$m^Qv~(c~fc&ahu~
zv8rLD6)mN{n9dm)hC&Fykb!UR=<Ya%rg19!uk`tgy7kf-v(8@ZWWLyqU-noN)%WMn
zS6n~2((;bsD+IG#;?5OoepVG))##Ss7PP<YU3y)(%?u?gx?rlmtgC<WCNyQ<(w-jY
zFC;UiPnhL;A#WYHY8tk1^R1{lY<~!oS;cJDs}odZV8Ft0J8NTIcX$*(;nAsg5x1*8
zqK#W3Ak!ZS-UJ9Fxh~#+#uGGL+3E@!mbG4&Yl|$11{ZWWP3sAVW7{stwT%?GeD_|;
z_z9(@f`l2J)=03B{`>(WmfroGSL*4(>5d;8Oe1~6UbFTPCx}2vJz7Pvq5piv_0C2V
zW@mckP_tWV_l9()ZbF(FHuoj^_%^&|@|DP3{74wWR%@P}7nvMnUyw9=^VafuPplDx
zTYPv|8-J%fMj3k-aih}z!(b1}w)u1Wj^!#n<Zc;&v$$O>t-B<pldp4bTRj^<z;JIL
z<Y4NQv94WXyZn2n<}S_DGU9a_0`CSUkEPulkPo<9SMv-;W;o+G#0CV)k5jg@I`j`6
zv$XDZg=4ggLuDDEv-kk&LQ>Iy+Cy;e+)g$-k$u*a((=mL)PKYFLy$xZb_%z7=D4{J
z|JFsswfC~~vKfCmGH)U$`DXfY<hANEUsVei7O#IhH+RBiVbL(F-|h)GX~l+^y|k3j
z74+8Uu@O~(HoX&C&eKRM<OGJo7T)|jch>0$^@`{;*X-Vk0&WRJa9OXIU(5~YkOzQ9
z4FLF!fR4Z~0bA8^<Z{~jmLF7fRBHPnv>{`1Yn+6r{twJ;YF<A|7u2ag$T_94>w60e
z19ebY&5l1;vd%-T)+&#o+8}pU2Nb>L7FV4a3$Cf-`@MTpv8i398~_lZ0HE^ANdN$b
zd_T%GI_3=dXf!tN1exFhl7j(18SXd%8;6KjM}k2Bp#IyajCECW>)Nt1O>K}WOQfm0
T=A^4GoV5XFpwP4W4*>WNe7(1?

delta 1560
zcmY*Zdo&Yz9N%P3-g^|;7+bNOtZRwpEK**vWym9}35Dbl<<ZM-o{?9Uk`Uc4$!n~w
zLJ`ZnD`BRhyrx1YjFzr@*WB*ue$V;-zTfZf^ZA_b`Tp~%!9K*QIFZ-M!vP8k3V^!_
zp|vWTfa|1{tq;_YHB3u6B4d1I>rVR=eR(Wgv-tIm3$R+`2^QYNJ*TB+lv?Lc;_7Hc
zlZ>p8_Ix{0!`H|il0{=O2OqGtMB@6uwzT^Fc^gblP1&~x{7IjZ>RjX`#Nl{m**B%_
zVk&!&KB=>)OWwa4xR>rIPFxt{8FjkF8@px(T|9Lt71yPnqUViZ9D8b%Hev4>JXHDt
zu^Ih{PAFjcyf2QRxX14GxT!2^MEeqLkQ3K8;2bWPULn09;Pr9*nQa-C(dm8AR<DbL
zUx5qZNi<Q`qN@H<S6hf*zrk~T$VF{y_npb(<#EA<v?Mt_AOqI8jWo*HcmUUsURwY8
zqgSH;eS3)+<|U2MO^xa`JtWZdG+<4dWJ==5Rg~$l4ZtuLR~<?kyT(4V>o1|-e01x<
zymPS~ML}m-k<=KL0JKFjSa|p=*m#(7a&htZgN<Xv;L;#H`JRaUG;CC;(ie)Dw#9sa
zquqh2Z}7j`>RD$OoN*giguSro{pIG82s*Au#~quL=*0+#Igjc1#zu<;(@9}R6)W7@
z%li%HGvBeE<+4BuC-~wx5LDX}40ySko$FO#IP9P}H5Y@`x_a*$+=lGzoJQ;4yLC(2
zNrZoLT)ZJMho(bbMaLW4c%h3Z;v*A7MI_Uz+VJ%ypDtxE3We1-LP6}w45UF&d+T^!
zVZP9rLGZ>1jQJ%W(nGrz_<TZx345jK#8Pko^=ZgD_JE5wp8z&t*YwR~wN)PjJwfEr
zHHZ0x6q8eT`$962dlqMlJGtkO3l9TyDsCi{PU_<M1n;RQB?sIrX0Aw<GP(JeZK60s
zOF@m#+2caH=ps%N&2T{M*YIK>To5|EvczD!3MfQHl7xHVOhS3smifUtOJt9J`W$?v
z%5-a)(8YqcwCio~oZMw_OI&ps+0c?u%npir)zs!);NV<Yzd4nv;G#@j_E+hJK5w4w
zF3|MWgRbrse1-&;KNFfqELj$a<Hib#h=IDjaS0C-I{q&19bou4#J@cBxLiO^W$fCY
z`s$7~+CmL7r{`y39h-9LnfiMax;OdKJM~&5y2XkoQ72ef)083C&L})`wXC#i*8uS>
z5@|TyUJ^HdwEy+>mhNh!W$h$T2I~m6QebmyV>TVpBYjYKcs3nVh|_)S=%uO`UBm2^
zei|IcO6Pi4%d;NS8lXFjm{dAWcZ77!Jfu@cHA!ObYb&btHp*Fez0b=M4+P7PaKtX3
z2JOUw%?hRtI84n>5w<X)hF1y0=lMIjw}SqNWcon7VMD~+YSoeMmgb5oI!QhY-NOk4
z_n@pL)@BnFPR@Re0Lp_aA0nA*88qPTm%*!ws0-8Q_7TGvpMVy}9gTgNWM5Gv!A>c@
z;+zxDiJ#P#m`nRwd-K3jV#Tu3@vLR>o2({5c<S49yrNu|oA2xqMXpsY)et+b4B38u
zSZj30X0_Ok?}Vok{82YUc%FH-2kr5T)0N|;ysjsu_gq+!28x-&+jYXpVwViv{ReZ~
z|D@d7bcLAAfKJgOcZp11J#aqF4MjwomN>h5eiVYQZbXUZ7h1DaCQ&H+Wb*9##=p&b
zoK{8V^n{eaf!jP!?(PD|^lP?8?tUX}*!hx<&oMdNseH}1MBkzByNy>goXB8>sOA^%
zM&tp2F$e(gKP$8a{0#On@W7fYns4Y^YoJQAax$NkQ~lR45o#W5P?UPansa`DnEs$J
z(NG%|X|?@t6Z16GOop(a2%rbE8;U{wz&SIAd-H$*K(`zKp!RdOteP=ZVLCF!Z!iQ<
zl}UynWmB+pT4g4~P%`~C)L<7vs{bxc=`p{A29pQVm2tilmnIOTxQFy&*e?tKAcDCL
KuD^a<Cj1A#+OdZK

diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs
index 87fdc25..2975869 100644
--- a/netforce_clinic/templates/report_cycle_item.hbs
+++ b/netforce_clinic/templates/report_cycle_item.hbs
@@ -21,14 +21,18 @@
     </thead>
     <tbody>
         {{#each lines }}
+            {{#if cancel}}
+                <tr style="background-color:#b6b6b6;">
+            {{else}}
                 <tr>
+            {{/if}}
                     <td>{{no}}</td>
                     <td><a href="/ui#name=clinic_hd_case&active_id={{hdcase_id}}&mode=form">{{date}}</a></td>
                     <td>{{cname}}</td>
                     <td><a href="/ui#name=clinic_patient&active_id={{pid}}&mode=form">{{pname}}</a></td>
                     <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>
                     <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
-                    <td>{{currency fee zero=""}}</td>
+                    <td>{{fee}}</td>
                     <td>{{epo}}</td>
                     <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
                     <td>{{dlz_use}}</td>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 83a1ba0..7a920c0 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,11 +1,14 @@
 - report
     - walkin
-- receipt
-- merge data
+- receipt **
+    -
+- updaete & merge data
     - patient
     - doctor
-
+- *** template:
+    - change company name in all report template
 ====
-ต้องมี เมนู 
+
+improvement: 
 1. ย้ายผู้ป่วย
 2. ปรับ level