From 0ec21478a7fa068e3dbdac983dadfd0f2392162f Mon Sep 17 00:00:00 2001 From: "chayut.s" Date: Wed, 29 Oct 2014 11:44:30 +0700 Subject: [PATCH] merge --- netforce_clinic/actions/clinic_patient.xml | 2 +- .../layouts/clinic_report_hd_detail.xml | 2 +- netforce_clinic/reports/report_hd_detail.xlsx | Bin 6131 -> 6389 bytes .../templates/report_hd_medical.hbs | 6 ------ 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/netforce_clinic/actions/clinic_patient.xml b/netforce_clinic/actions/clinic_patient.xml index edb3dfb..9ee98a8 100644 --- a/netforce_clinic/actions/clinic_patient.xml +++ b/netforce_clinic/actions/clinic_patient.xml @@ -2,6 +2,6 @@ Patients multi_view clinic.patient - [["All",[]],["Medical Goverment",[["type","=","mg"]]],["Social Security",[["type","=","sc"]]],["NHSO(30฿)",[["type","=","nhso"]]],["Personal",[["type","=","personal"]]],["Others",[["type","=","others"]]]] + [["All",[]],["Medical Goverment",[["type","=","mg"]]],["Social Security",[["type","=","sc"]]],["NHSO(30฿)",[["type","=","nhso"]]],["Personal",[["type","=","personal"]]],["Others",[["type","=","others"]]],["Archived",[["active","=","False"]]]] clinic_menu diff --git a/netforce_clinic/layouts/clinic_report_hd_detail.xml b/netforce_clinic/layouts/clinic_report_hd_detail.xml index a16cb78..778daa9 100644 --- a/netforce_clinic/layouts/clinic_report_hd_detail.xml +++ b/netforce_clinic/layouts/clinic_report_hd_detail.xml @@ -1,7 +1,7 @@
- + diff --git a/netforce_clinic/reports/report_hd_detail.xlsx b/netforce_clinic/reports/report_hd_detail.xlsx index 1e67ae720fcd943bbfce35b68f5f39fa11e7cacd..b518d6b6a5559043ac0237ccd90eaa4bd12607fb 100644 GIT binary patch delta 3963 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 Plp(p7iI+Tw@i+cox}{PJ delta 3739 zcmZu!bx;&)_g+F;VnJHEON6CCmZiHJMCtAZS%D>_adkmLO1eYo1tb=cl2!78efXqM}51$4=L_`GGwrnJ$!@=FQZ05$H z|BY}(TtTR%cEExpCGyPNH*~o2wZ=id#)x#dg>yhfjYx+=A&09G*KPk^9{KjJ~!G}nW!p5^o#@`W|z5zXB=)6?`KU<`OscBHz{^)r{ zZBkya7~)c#SxSW+#^of{G_|6AnCwEWHLkGfmB!7PV0yw>U0pXYZP7*LPBzOe=?Pk8 zP;>m&)5n`<8k9a_&s8TCVkA_*&S?6Wboo9$hSCE3ggE*hejR&5d~XENFDP*|1*0ei zcCA=5cU@DoSu?gV?hI;@ z^awB$LiP1gt4cfDZLCNZ%kV8=3O71Pluekukb75lJ$9W)?h_R*2Ejg>O8F8H9VE?0 zOvT1t6;Q&>4&YKL6cG9(BwI$6bflsZS{m%H9>su zbm-d(Y8>0JmPP!2Ad_UushV-GB}1f z?32?)z_zW865gwVNR<`~1liZOA%)ln;c?)C&fR-4*S7VP&@DvW6G>Wn`haT?<=p(Vl@e6X%<}X?G zsE$Ww%`A12FZDtuHHM<(GRnNtw1dZCQ6K5abK4BXG0-L?nvVGklt};pD6jzl|1>lB zHZc!0&O|qPL6oxl%$#Vi-EcmxROmz2DrLBpmWF<5wh~MIou+m7p~W)i+lUR_!a*Z+ za^JqgkhqWU;Xy#dDj|W`((9u|XTdwNd)8}jwJtW=pjS#H_P)Xv`wg#nxh@R4`4cT% z6=g&=_VQ`q;@^2|9`x4IG}e?DosO<`8@-EwGC!A$QlWb@o`55bjOSH#0J~PIulH4* zE$rnp_DWmcbF7M~)|WHHE0SK`!b`4~a}-4&?#-U*a_v}7_$og!5-4-->`(imPGaeAJ6OL;EYatO zp3YH7hiFw^z7wwNo9HF5Z7L-dN-KZZxZCB-I=!_UjNrM{2;f&~ur z3nJ>Ed+0Js7WAU|Y$EkB<}?3|rjXfY?xDPAm2@~ku3Vf)nWCkg`E`N2w6`LvwVrsL zzV%(kdz+W8HuAlBY+FN4`!BM%9Vxs%ac%fO278oGn0^mR6hu27hXVju{IJUS*c~?twfDN=PD743*N)ryAdKrqSzgd$Y2ZFp&<;iT`>{b%4;DX;H%y z3=w67;m`aE)a75ng2_^S0C&gK8F9E$elZmCqY5+^Aix-Dh&KNgk60VrE+SP!f!q=9QLL6SD?%F?T7eoG+6SPC0?5=okdyGycb>0f#m5< z0XpoFxY7#!z4yQLyJ{z(=KO3B1%jANhX`bYx=|%)LeKtbDy0CO8R}Kc7dD&}r6km^ zOlhp5gB@1|fmD}8>84|3ht(7Q%4#o)s1@SwWxUASR$*>VCiel_NJ*mZTQ zy4W;{T8-Lry(7sLvJ%FdHr?8-t~qN3%3`(79@Ue#aK*WTz@m=wWT|E1e$HG}u0#%87`nJP0Ea>roqQJsRX8x>RZl+@s9Zjn zF9N~iBDQ)|?3(1jw?6kXb1LM`b&{*j^n7G7OsT+$iH9FyI2Z-Jxe8V9PXA8f zW9z?LLmd(3K!weDoNdcu)RZm&AZxTb>=1z_Vq|z3+SC2kB1+29lo30*g z96j1EOxUl)!V~(BR~~02YK!{ix2E3gj1za-fAq@cTiX8%8}R~e{3UA9=Gc$go#jDmyDLNIDqaqXXZ5oUzZ77m<}2) zm`K#*GA;x&-!Ewz3C4>qUmNoqD45SB&uy3-7@r1wiCfJdvt41f-W%2}glrhTd{W@@)@=hbfUek&mK z)Xf6@xB4+l{aXR8RRRBhnn!`aKP%WWwZ$Klz32Z&8|!GLes5%(v})wrme#8OH9fc- zoiyw3tAENX&423sK@#{&I!@^CocFu7=~;hAHGfA!H1H96Zi2V>ewY3~_|WAK diff --git a/netforce_clinic/templates/report_hd_medical.hbs b/netforce_clinic/templates/report_hd_medical.hbs index 7a9890f..99b8800 100644 --- a/netforce_clinic/templates/report_hd_medical.hbs +++ b/netforce_clinic/templates/report_hd_medical.hbs @@ -14,9 +14,7 @@ Product ID Product Name - MG UC - NHSO (30B) Pay Total @@ -26,9 +24,7 @@ {{product_code}} {{medical}} - {{mg}} {{uc}} - {{sc}} {{buy}} {{amount}} @@ -40,8 +36,6 @@ - - - - - - 32