From 9a34d2bee37ca8e9109717100d59a57f306ecb77 Mon Sep 17 00:00:00 2001
From: CASH <phongsan.b@almacom.co.th>
Date: Thu, 11 Sep 2014 10:21:52 +0700
Subject: [PATCH] add setting account clinic

---
 clinic.egg-info/SOURCES.txt                   |   1 +
 clinic/__pycache__/__init__.cpython-32.pyc    | Bin 0 -> 244 bytes
 clinic/actions/clinic_hd_case.xml             |   4 +-
 clinic/actions/clinic_setting.xml             |  10 ++
 clinic/actions/clinic_visit.xml               |   4 +-
 .../__pycache__/__init__.cpython-32.pyc       | Bin 0 -> 148 bytes
 clinic/layouts/clinic_hd_case_form.xml        |  46 +++---
 clinic/layouts/clinic_setting.xml             |  14 ++
 clinic/layouts/clinic_visit_calendar.xml      |   5 +-
 clinic/layouts/clinic_visit_form.xml          |   7 +-
 clinic/layouts/clinic_visit_list.xml          |   1 +
 clinic/models/__init__.py                     |   1 +
 .../__pycache__/__init__.cpython-32.pyc       | Bin 665 -> 726 bytes
 .../clinic_dialyzer.cpython-32.pyc            | Bin 0 -> 3617 bytes
 .../__pycache__/clinic_hd_case.cpython-32.pyc | Bin 0 -> 8686 bytes
 .../clinic_hd_case_line.cpython-32.pyc        | Bin 0 -> 2077 bytes
 .../clinic_hd_case_line_detail.cpython-32.pyc | Bin 0 -> 1392 bytes
 .../__pycache__/clinic_patient.cpython-32.pyc | Bin 6592 -> 6591 bytes
 .../__pycache__/clinic_setting.cpython-32.pyc | Bin 0 -> 1573 bytes
 .../__pycache__/clinic_visit.cpython-32.pyc   | Bin 3021 -> 3282 bytes
 clinic/models/clinic_dialyzer.py              |   2 +-
 clinic/models/clinic_hd_case.py               | 137 +++++++++++++++++-
 clinic/models/clinic_patient.py               |   2 +-
 clinic/models/clinic_setting.py               |  22 +++
 clinic/models/clinic_visit.py                 |  21 +--
 25 files changed, 236 insertions(+), 41 deletions(-)
 create mode 100644 clinic/__pycache__/__init__.cpython-32.pyc
 create mode 100644 clinic/actions/clinic_setting.xml
 create mode 100644 clinic/controllers/__pycache__/__init__.cpython-32.pyc
 create mode 100644 clinic/layouts/clinic_setting.xml
 create mode 100644 clinic/models/__pycache__/clinic_dialyzer.cpython-32.pyc
 create mode 100644 clinic/models/__pycache__/clinic_hd_case.cpython-32.pyc
 create mode 100644 clinic/models/__pycache__/clinic_hd_case_line.cpython-32.pyc
 create mode 100644 clinic/models/__pycache__/clinic_hd_case_line_detail.cpython-32.pyc
 create mode 100644 clinic/models/__pycache__/clinic_setting.cpython-32.pyc
 create mode 100644 clinic/models/clinic_setting.py

diff --git a/clinic.egg-info/SOURCES.txt b/clinic.egg-info/SOURCES.txt
index 0790ecb..3104b53 100644
--- a/clinic.egg-info/SOURCES.txt
+++ b/clinic.egg-info/SOURCES.txt
@@ -11,6 +11,7 @@ clinic/models/clinic_dialyzer.py
 clinic/models/clinic_doctor.py
 clinic/models/clinic_hd_case.py
 clinic/models/clinic_hd_case_line.py
+clinic/models/clinic_hd_case_line_detail.py
 clinic/models/clinic_nurse.py
 clinic/models/clinic_patient.py
 clinic/models/clinic_visit.py
\ No newline at end of file
diff --git a/clinic/__pycache__/__init__.cpython-32.pyc b/clinic/__pycache__/__init__.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b14183e11117b0863b934b6fc792cb484a1eada6
GIT binary patch
literal 244
zcmZ9HO$x#=5Jo4di1-5@LL?jQ1w=f7o9?;^l15sXG?Fw6kK+-&fnOA{7&0$;%omvO
zay8#Ro|U1|lDMBxaRW5if|$q&ss)Mc^6ipp2`{Kp69hW}sEjlPoNp}0k1ycH_e1c^
zHpH_katbw$roWWR{U6c}TDIQV(p+L&_I9}XU|`(!o%tSG!v?MQw|ko5#Q}39w#PhI
I%pY5e7l%$T)c^nh

literal 0
HcmV?d00001

diff --git a/clinic/actions/clinic_hd_case.xml b/clinic/actions/clinic_hd_case.xml
index 1097fdc..e06a7a3 100644
--- a/clinic/actions/clinic_hd_case.xml
+++ b/clinic/actions/clinic_hd_case.xml
@@ -2,7 +2,7 @@
     <field name="string">HD Case</field>
     <field name="view_cls">multi_view</field>
     <field name="model">clinic.hd.case</field>
-    <field name="tabs">[["All",[]],["Draft",[["state","=","draft"]]],["Pending",[["state","=","pending"]]],["Confirm",[["state","=","corfirmed"]]]]</field>
-     <field name="modes">list,page,form</field>
+    <field name="tabs">[["All",[]],["Draft",[["state","=","draft"]]],["Confirm",[["state","=","corfirmed"]]],["Approved",[["state","=","approved"]]],["Validate",[["state","=","validate"]]],["Payment",[["state","=","payment"]]]]</field>
+     <field name="modes">list,form</field>
     <field name="menu">clinic_menu</field>
 </action>
diff --git a/clinic/actions/clinic_setting.xml b/clinic/actions/clinic_setting.xml
new file mode 100644
index 0000000..7dac94f
--- /dev/null
+++ b/clinic/actions/clinic_setting.xml
@@ -0,0 +1,10 @@
+<record model="action">
+    <field name="name">clinic_setting</field>
+    <field name="string">Settings</field>
+    <field name="view_cls">form_view</field>
+    <field name="model">clinic.setting</field>
+    <field name="modes">form</field>
+    <field name="active_id">1</field>
+    <field name="menu">clinic_menu</field>
+</record>
+
diff --git a/clinic/actions/clinic_visit.xml b/clinic/actions/clinic_visit.xml
index 6afafb2..2de58af 100644
--- a/clinic/actions/clinic_visit.xml
+++ b/clinic/actions/clinic_visit.xml
@@ -2,7 +2,7 @@
     <field name="string">Visit</field>
     <field name="view_cls">multi_view</field>
     <field name="model">clinic.visit</field>
-    <field name="tabs">[["All",[]],["Draft",[["state","=","draft"]]],["Pending",[["state","=","pending"]]],["Confirm",[["state","=","corfirmed"]]]]</field>
-     <field name="modes">list,calendar,page,form</field>
+    <field name="tabs">[["All",[]],["Pending",[["state","=","pending"]]],["Confirm",[["state","=","corfirmed"]]],["Canceled",[["state","=","canceled"]]]]</field>
+     <field name="modes">list,calendar,form</field>
     <field name="menu">clinic_menu</field>
 </action>
diff --git a/clinic/controllers/__pycache__/__init__.cpython-32.pyc b/clinic/controllers/__pycache__/__init__.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6fd756360f232f9dea122479351cd49a050a57dc
GIT binary patch
literal 148
zcmd1d;pO^0?Llxd0}@~avK@f9m<33rFfasbfJFQ>fCK{?QECYk)6dAyP1R3MEY8r+
zOD##uFG>dTax(KWli^f;UP)1YPEKl3v3`6!P^Kh4Uaz3Clmn>SCO1E&G$+*#WJfU&
GGXMbPwIHPc

literal 0
HcmV?d00001

diff --git a/clinic/layouts/clinic_hd_case_form.xml b/clinic/layouts/clinic_hd_case_form.xml
index e215b9f..80be1ac 100644
--- a/clinic/layouts/clinic_hd_case_form.xml
+++ b/clinic/layouts/clinic_hd_case_form.xml
@@ -2,46 +2,56 @@
     <head>
         <field name="state"/>
         <button string="Options" dropdown="1">
-        <item string="XXXX"/>
+        <item string="Journal Report" method="journal_report"/>
         </button>
     </head>
     <separator string="HD Case Info"/>
-    <field name="number"/>
-    <field name="patient_id"/>
-    <field name="date_start"/>
-    <field name="date_stop"/>
-    <field name="wh_start"/>
-    <field name="wh_stop"/>
-    <field name="bp_start"/>
-    <field name="per_bp_start"/>
-    <field name="bp_stop"/>
-    <field name="per_bp_stop"/>
-    <field name="hct"/>
-    <field name="doctor_id"/>
-    <field name="nurse_id"/>
-    <field name="department"/>
-    <field name="lines" nolabel="1">
+    <field name="number" attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="patient_id"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="date_start"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="date_stop"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="wh_start"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="wh_stop"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="bp_start"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="per_bp_start"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="bp_stop"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="per_bp_stop"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="hct"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="doctor_id"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="nurse_id"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="department"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="lines" nolabel="0"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'>
     <list>
         <field name="dialzer_id" onchange="onchange_dialyzer"/>
         <field name="detail"/>
         <field name="member_type"/>
-        <field name="bid_flow_rate"/>
         <field name="dialyzer_type"/>
+        <field name="bid_flow_rate"/>
         <field name="ultrafittration"/>
         <field name="use_time"/>
         <field name="max_use_time"/>
         <field name="state"/>
     </list>
     </field>
-    <field name="lines_detail" nolabel="1">
+    <field name="lines_detail" nolabel="0"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'>
     <list>
         <field name="product_id" onchange="onchange_product"/>
         <field name="detail"/>
         <field name="qty"/>
         <field name="uom_id"/>
         <field name="price"/>
+        <field name="total"/>
     </list>
     </field>
+    <field name="fee" span="2" offset="7"  attrs='{"readonly":[["state","in",["canceled","approved","validate"]]]}'/>
+    <field name="total" span="2" offset="8"/>
+    <field name="amount" span="2" offset="8"/>
+    <foot>
+                <button string="Confirm" type="success" method="confirmed" states="draft" />
+                <button string="Approved" type="success" method="approved" states="confirmed"/>
+                <button string="Validate" type="success" method="validate" states="approved" />
+                <button string="Canceled" type="danger" method="canceled"  confirm="You are sure to canceled hd case"/>
+   </foot>
     <related>
             <field name="comments"/>
     </related>
diff --git a/clinic/layouts/clinic_setting.xml b/clinic/layouts/clinic_setting.xml
new file mode 100644
index 0000000..9c9ba1f
--- /dev/null
+++ b/clinic/layouts/clinic_setting.xml
@@ -0,0 +1,14 @@
+<form model="clinic.setting" title="Financial Settings">
+    <separator string="Account Setting Medical Govelopment"/>
+    <field name="mg_partner_id" />
+    <field name="ar_mg_id" />
+    <field name="ap_mg_id" />
+    <separator string="Account Setting NHSO 30B"/>
+    <field name="nhso_partner_id" />
+    <field name="ar_nhso_id" />
+    <field name="ap_nhso_id" />
+    <separator string="Account Setting Social Security"/>
+    <field name="sc_partner_id" />
+    <field name="ar_sc_id" />
+    <field name="ap_sc_id" />
+</form>
diff --git a/clinic/layouts/clinic_visit_calendar.xml b/clinic/layouts/clinic_visit_calendar.xml
index 24aac59..2665592 100644
--- a/clinic/layouts/clinic_visit_calendar.xml
+++ b/clinic/layouts/clinic_visit_calendar.xml
@@ -1,6 +1,7 @@
-<calendar model="clinic.visit" date_field="date" colors='{"#090":[["state","in",["pending"]]],"#999":[["state","=","canceled"]]}'>
-    <field name="number"/>
+<calendar model="clinic.visit" states='pending' date_field="date" colors='{"#090":[["cycle","=",1]],"#2400ff":[["cycle","=",2]],"#ebff00":[["cycle","=",3]],"#f20000":[["cycle","=",4]]}'>
     <field name="patient_id"/>
+    <field name="cycle"/>
+    <field name="number"/>
     <field name="doctor_id"/>
     <field name="nurse_id"/>
     <field name="state"/>
diff --git a/clinic/layouts/clinic_visit_form.xml b/clinic/layouts/clinic_visit_form.xml
index e046c34..1618b08 100644
--- a/clinic/layouts/clinic_visit_form.xml
+++ b/clinic/layouts/clinic_visit_form.xml
@@ -9,13 +9,18 @@
     <tab string="Visit">
     <separator string="Visit Info"/>
     <field name="number"/>
+    <field name="department"/>
     <field name="date"/>
+    <field name="cycle"/>
     <field name="patient_id"/>
     <field name="doctor_id"/>
     <field name="nurse_id"/>
-    <field name="department"/>
     </tab>
     </tabs>
+    <foot>
+            <button string="Confirm" type="success" method="confirmed" states="pending" />
+            <button string="Canceled" type="danger" method="canceled"  confirm="You are sure to canceled hd case"/>
+   </foot>
     <related>
             <field name="comments"/>
     </related>
diff --git a/clinic/layouts/clinic_visit_list.xml b/clinic/layouts/clinic_visit_list.xml
index 258104b..428b979 100644
--- a/clinic/layouts/clinic_visit_list.xml
+++ b/clinic/layouts/clinic_visit_list.xml
@@ -1,6 +1,7 @@
 <list model="clinic.visit">
     <field name="number"/>
     <field name="date"/>
+    <field name="cycle"/>
     <field name="patient_id"/>
     <field name="doctor_id"/>
     <field name="nurse_id"/>
diff --git a/clinic/models/__init__.py b/clinic/models/__init__.py
index 27cbf6e..7253074 100644
--- a/clinic/models/__init__.py
+++ b/clinic/models/__init__.py
@@ -6,3 +6,4 @@ from . import clinic_hd_case
 from . import clinic_hd_case_line
 from . import clinic_hd_case_line_detail
 from . import clinic_dialyzer
+from . import clinic_setting
diff --git a/clinic/models/__pycache__/__init__.cpython-32.pyc b/clinic/models/__pycache__/__init__.cpython-32.pyc
index dc1600bd00f053179a9cc8c6f7acd9d0947c4ded..652a9d8e1a6de654023e832fe916322e619dbdfd 100644
GIT binary patch
delta 141
zcmbQqdW}^+hliKTfJY!CnE?qf0oe{fTs&o>e2XXpLkcHD4g*6jCqon`17ivoL$C(-
z#1&ViH5h?vO8J09a!zJmW^#OSYDr0EUb>$K*W?DqwZd4WChIaqi3k972r!~T07s1*
Ab^rhX

delta 79
zcmcb{I+ImChliI->)F5HWCkR_1Y|n^adFE;`4(1AhF}e@i94<``)P1aUctC_at2eB
M5Fb!lfDsu20Ezn!V*mgE

diff --git a/clinic/models/__pycache__/clinic_dialyzer.cpython-32.pyc b/clinic/models/__pycache__/clinic_dialyzer.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1765c8bac7f53ccfb068e93cfff1729b589c1889
GIT binary patch
literal 3617
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
Y*xp+%inqBOTei?u*mjXETwA^QAMjm7#Q*>R

literal 0
HcmV?d00001

diff --git a/clinic/models/__pycache__/clinic_hd_case.cpython-32.pyc b/clinic/models/__pycache__/clinic_hd_case.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cd25e8bd9d2863e7599ccd2df5e7a5ec790ab749
GIT binary patch
literal 8686
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
U9R}ExuJRJRNdw}Zt1SHO--ME~6aWAK

literal 0
HcmV?d00001

diff --git a/clinic/models/__pycache__/clinic_hd_case_line.cpython-32.pyc b/clinic/models/__pycache__/clinic_hd_case_line.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3f921ad8847784cef570dc907fffb653225e1385
GIT binary patch
literal 2077
zcmb_d-H#hJ5TDK0<#HdbTB$8kr7q<qK%108j~B#8dq5G&A(6Y6yjafK$-44x!rG=6
z#9R7*@|PenGfr~N<<uv#S?_##JpRp$Z4Zw+|GfKmn8AC$2GZZ->lQdD{3l=miUdXp
z6g3#tps2&B4hiXMU>i_0VbqL#9c&9mEuPl^y9Y%ZM(wC;GQSU_eMo**EqI6X_dqAG
zM1LL79e8s9OF-i~47+Vy-QWw|Iu4<U!(gVg4K1W5MqA~=K9W=IML~*gLUu<hk&<4D
zx%By2l;2v(W#-MFS_G%7sJOGO$Y#Y{mWzy>(T~0q%1eA*irn7-KWZQ_aQ_H~!N}|I
zra?F%92mQL3JTdKENeB~=E+LE2dWKfpVZ4*qB>E5P#vtLNumy;6m5@Si4Ko9{4M5h
zM;;yZK=naAgDEa}f3+<6eXz0k0@QO*U+!2u+W1V@;l`+vn)*2Ekbk_R`()$!D^M>$
zov`Q6a5tbnhZ9VpdV-1j8j%WjamcJGP1eg*FOyF9kkjFKN6z_ttzMx?AfPM#M=+IE
zoZML{Ftgh0utyW6%cRnwgLJM0c@;(lO6_VbWu#sFr7Jc+MTTf97^h{G<vf#YP)suq
zP@}ZVDl_+HR<fniUK-1xTsWP2Q^dHiVgxgXIB6g+Qxrrk2?}{hH5DzWRzvB+IFRas
zs5H~o1{<iBNkLl}UWuuY-J<ll_9o+<4>ueIInc#eSLyj;t~uy}dEtpCmv;7+BgSt!
zvEec_P?(!(&c29<VzO0Z8*v!hG&hrAFS%*f&_$>B(D0>E=}+YGcj<N7Eo{Fq<)>^s
zHcCuTB`Q>LvM;Q!<ivO!3Ci@>X^#^Vw&mQ%3N1ayeWu?s=&>uA{DB*kH=wH7oQYE+
z2&18wKDhLB#C{xd`s}=0Lk$aV20iL;Mn3930RPqG>ljDP%|Ktx+C@9+s7AJMh+?YM
z9Wbs|+CrpDmBDEjqLhUeg7YfqI1H9pT7*@M?CQ{@CL7=p_xv~PM+*PE3Xyn~%h)-;
zlwMD<a~N{$KTHXB2YJJKzzk3`is&vLqEya8*jXm66QYY8@DRR3s-Mpa-N$at`=$1i
zS(PEjXT$o#=eJvNV%^$wVD#n--qdSF-A)o(+daUcleCh0@+kQzxtH9==P^DH@wsN-
zr5@ySXT5ljm*edWK6s;S&kEjHw|l=ZgnTg2IkZ_rW|?-5TYzq;_pY6A^Nn*Y?A2K~
kHO}Krg`Ojz{~xMtboouJlyB*hbA;1F#PN{Otld5S53~>TSO5S3

literal 0
HcmV?d00001

diff --git a/clinic/models/__pycache__/clinic_hd_case_line_detail.cpython-32.pyc b/clinic/models/__pycache__/clinic_hd_case_line_detail.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7304bc95f696b0ae7dbfe862f5f8800f4ecd1d74
GIT binary patch
literal 1392
zcmb_cOK%e~5FT&dkG7$O@(>c&oDzvcPY5AeN;#x0YB-RKW!Y}y%DbDcZKO!t!hhn&
z@E`aIh#BuDYSoGptJt2m$KTAv_P4sfe*d|UaO<lh{SKE~;->J&zyhQUW(?8<W(lM<
znAL!hE&*GIv;nh5$=AR(Vb+X(b+9c++c0aFx<=$XFzW#OsG9Ht{ac_JtT0{|bQi9B
zumUu$!NstRw;NnAtl<_KxJ`1UZD=BOX|z=?bdbE#o~NW3GP2vML`rzU7sAg^OZiSE
z7t)(=ng^$gQn7niA@g)0vZbV8^wCMFyvOB!;`SZjg9ZWv-;ZDzd_oPb>x2`+fw`-v
zppb3ADoOB}2bH=7stu|`>Q%y2w^Sfhy|t7v)i0%Jy9Fx@xV>@T0X0}huYx4%QK`nb
zyU~1a!#|Gv6F5M$)js0+408`JaFf<#MvmrcB!$x><n%~sFN_V__tX*X6LpA|fnX@~
zO)!O45&Asih`aVWw8&97DU=Rfr00rLaBfsoEs9(P=_7q!(NspKMIq<WqcS0n9%_!X
zlZ9D$lV>r7DnV+6&(p7g&KtjsXUNldemR>&Q{*WMHOzToq>j{LLrrrpY?OJTPNzdk
zI6jW^Or)Cgm=LF~3YJ(36;-!;kI<N4r@TJPbf_aUEka2g&P5TQ`YH4JN*B@p*yf@H
zfS1i%b|2l%xy_}pj`JaM5VvrQ)Oen!dW=BM$C>t*c_ERD)mtC2@m<C7HR@DStPGWO
zv{;4#hB{GH4^kXOITg%N>vvg`)z~Zcob9s#o&)xv{jiU=u|L+CjN;w#ZIge_<z27f
zjdk~@G$QCtssjz`<_;mHb}q_j&TkEGczA9fOup*eE8{#)J;pCF{_jAyG4h+TYu?iT
Qh9l5kBBXs>gJiGw7oYn}@Bjb+

literal 0
HcmV?d00001

diff --git a/clinic/models/__pycache__/clinic_patient.cpython-32.pyc b/clinic/models/__pycache__/clinic_patient.cpython-32.pyc
index 53b3103fb652f1ad0ad56c344d990679c0f982c3..c4ac44ba27bd3f8ae0f82921589b588f36e36aea 100644
GIT binary patch
delta 29
kcmX?Lyx*83hliKz?MMEQjT{+lZ0rmS3;~Io%h^1I0g7A*F8}}l

delta 30
lcmdmQe889^hliKzt;e6>jT{+l>>LaX3;~Hno6Fcdg#nlk2;~3(

diff --git a/clinic/models/__pycache__/clinic_setting.cpython-32.pyc b/clinic/models/__pycache__/clinic_setting.cpython-32.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c47bbd58c4f626807a3728be9843db20bde4cc92
GIT binary patch
literal 1573
zcmb_cOK%e~5T4CDY1)RCmjn_~x#W~qAoYL{f+AEdeTZ<{i?w*&#MQpEwkt*A7XBT7
ziWz%1a+)G>Ae;5tpXVEoKaVFF?hfE+^qqtEYhnK*zG{h0jQ;=<fHZ(GfV2T&1JWjh
zO$cbN0Z9weHiT_AZbH(5uw!{GNV<^rAnduhwjK8&>_c!Kci<QDyC4Esp}zr$0o?Au
z3edO-vq=wEm-xb@iH&JvbCJg)F&*sPNRh<K^sze^nx!-`3CM1@g5pR=tcdjD(&76R
z9&s)21T#vMZsK5bg6C-wWlK)Z=to~t<P2Z+8=Id1Uj&dCxPKG_<v}rIA4Cgo+oTAF
zzrwZ!rxk=~$3k5n>RG72hLAF_(9Rk{;?P37KD1|{{WXNdk%b<uAtWAH=+K8ATj&X#
z(g8h1ji2Fu%pNv8k(uOECA5~=+;kC|dHo_PbtX#l9Pw+{A76-A@+cXf=XW9%nYPNO
zbJX10G8r4vJmNeznVwc(^BS>F4jX?HT*$lVM<TYp(eXzmLx<>S?2)dcB`x<CMo}?F
z$fzT|{5rcDzdbp#@nj2?`!T-oT)TJ##k1xNa315ZG>n84sKc)#*|aUzwxn(y!z||#
z#hM9jN~xDtEXDmmjy%s^Aoq!tF381bUU{54ng<C5vxLhDova}rjAc<O7&Ej%MmNYL
zG^BfGr)&~1rAtZ(@6HkV0&mEht4uf>cNyJna^8|0Gea>pL0hnmd568@MV^Xd9;wA~
zCiG2Sava&rt3UQ4t7^ombetAWug})B%1hdaqSF`z9ekR>;l0O7yg``^(cGqcz53Ly
z_YbvYlV!9_)OMvYR424dg-f(*hm`q3DT`69@(Pf7xb|#EZcnTfbE!0zEnLNk`d^go
Zp||($_&-pwQ>4<%U=$4T9W@U3{{S(Ei2ncp

literal 0
HcmV?d00001

diff --git a/clinic/models/__pycache__/clinic_visit.cpython-32.pyc b/clinic/models/__pycache__/clinic_visit.cpython-32.pyc
index 80a1348bbe164c810740acd7b6ec1ad5076d708a..f892923c72b7bfb65c829f6fc59816e67eafae50 100644
GIT binary patch
delta 804
zcmY+A&2H0B5QWdRoA@V58<IBA0HOj40b1ImB`vT-io^m?X~e=i%VQ!#a8ObU!6u6o
zv1D<Dgv0`P02Zigcmq_aPtX_O0oXCVhS-%QYv!D9?wxagojzJL`^A#|bGzLAZZ?E?
zFPox1Zo$ccG&p$>*9HO`zKLfRNC(ZtA~DdyL}-k)W6uULZJe|<jm)Xd(+nkZnxMke
zD1u5EW44w!1<+jfIC(4<#vA`ZzPXZcJi7_H1!{w~(Bt*a{u`U{HRq<#Ht06!4tkv7
zQiiyk5VN3V&=t^COqggSDsOxZbR827bOY@jXAS{CE7%us$_SV|4~mZ{$1m2VRqV6R
zsB;Q*6HZ0(Yl^R`dR^7?peA-3cjZ^@(6RwM2}Z%5e50>E5ZpB*o&S$QKZ?7S>bkE6
zs@sTWSnCe`#N1SEXAlje9P9U9dwpM3UR=p<=9z;dy{?J6{GD5thxyO*6~@Tj^OxL_
zx1y*eSH3lN3l<yRAbc7OU&v$QV?ERRoD3MnH$zl~d}r*~W{kU`=l5fJoVGq^%fJu2
zorcDO+J2fWm8S7hDb1K_Y0yM7_{f)jNI}?(xRyW6`(i;F)+aN5hmPAH$uHL9#S<Z-
k%#!kt^<1n=-@Z`2C~Bgn7Yn*D_$z67y?F4!-V$Q%FS-_-djJ3c

delta 655
zcmZutyKWOv5IuA4?9)zSTd@^h2?-la@H&8y`2dhW6cLhX*dmg{Y{Diuk-T17ker_4
zHi(Enph5WtN`%B0@C7t!Qcy5=H!?w@n7K1^&Y8#kvG}d!yslKe`u)@X7pG0MukX^O
zx9f;zzzUHCme@w(B6hInf=l4CDY6jOF(D<ip20k@u<d_grP!Imq83u2Q^fuhsDP^%
zfZ1k&_~5yV?etGtkk$T9t`|I!-v)QUA-IcOS?}_>Y$9W>6eJmN6?_f6go)g+JRN==
zyn=}Wuc8;tA_4dYjtJ2l5^2?d>A(Sw1eizIi)AM{nb-1)5zT{dBC6%mb}p@hZ=v7b
z&|lSe&j;{u6c5I+{!|JZGm`RXurtm~^vFaft@1rZi~6Y*^pzAJi=|a@V_=WKB>yb!
z478a!;)54qFbo6EOIg`4lVO}g>3Fnbk~T>-Gj5=3{u6y>RopenQZeXl>vL;C0+y|o
zIZj`84zl5PJd#+i*nP(m?9E}q`knpZj_GfbuDq#9Kn>b_UJU=wIr_c3MGgJSJ=WTL
iW}nOTZ*QNv`jx*_Yf`gR@k?ZrCstL~$w&VIQRfd{s(VNP

diff --git a/clinic/models/clinic_dialyzer.py b/clinic/models/clinic_dialyzer.py
index a557e7c..8f0f326 100644
--- a/clinic/models/clinic_dialyzer.py
+++ b/clinic/models/clinic_dialyzer.py
@@ -19,7 +19,7 @@ class Dialyzer(Model):
         "exp_date": fields.Date("Expire Date",search=True),
         "patient_id": fields.Many2One("clinic.patient","Patient"),
         "member_type": fields.Selection([("unsub","Unsub cellul"),("sub","Sub cellul"),("synthetic","Synthetic")],"Member Type",required=True),
-        "dialyzer_type": fields.Selection([("low","low flux"),("high","high flux"),("dbl","dbl hifulx")],"Member Type",required=True),
+        "dialyzer_type": fields.Selection([("low","low flux"),("high","high flux"),("dbl","dbl hifulx")],"Dialyzer Type",required=True),
         "bid_flow_rate": fields.Integer("Bid Flow Rate (ml/min)",required=True,search=True),
         "ultrafittration": fields.Float("Ultrafittration Kg.",required=True,search=True),
         "state": fields.Selection([("draft","New"),("active","Active"),("drop","Drop")],"Status",required=True),
diff --git a/clinic/models/clinic_hd_case.py b/clinic/models/clinic_hd_case.py
index 9b71dff..86b2821 100644
--- a/clinic/models/clinic_hd_case.py
+++ b/clinic/models/clinic_hd_case.py
@@ -1,7 +1,7 @@
 from netforce.model import Model, fields, get_model
 from netforce.utils import get_data_path
 import time
-from netforce.access import get_active_user
+from netforce.access import get_active_user,set_active_user
 from netforce.access import get_active_company
 
 class Hdcase(Model):
@@ -25,11 +25,15 @@ class Hdcase(Model):
         "bp_stop": fields.Integer("BP mmHG stop",required=True,search=True),
         "per_bp_stop": fields.Integer("/Per stop",required=True,search=True),
         "hct": fields.Integer("HCT %",required=True,search=True),
-        "state": fields.Selection([("draft","Draft"),("pending","Pending"),("confirmed","Confirmed"),("canceled","Canceled")],"Status",required=True),
+        "state": fields.Selection([("draft","Draft"),("approved","Approved"),("confirmed","Confirmed"),("validate","Validate"),("canceled","Canceled"),("payment","Payment")],"Status",required=True),
         "lines": fields.One2Many("clinic.hd.case.line","hd_case_id","Details"),
         "lines_detail": fields.One2Many("clinic.hd.case.line.detail","hd_case_id","Detail"),
         "comments": fields.One2Many("message","related_id","Comments"),
         "company_id": fields.Many2One("company","Company"),
+        "fee": fields.Float("Fee",required=True),
+        "amount": fields.Float("Amount",function="get_total",readonly=True,function_multi=True),
+        "total": fields.Float("Total",function="get_total",readonly=True,function_multi=True),
+        "reconcile_id": fields.Many2One("account.reconcile","Reconcile Id",readonly=True),
     }
 
     def _get_number(self,context={}):
@@ -66,14 +70,137 @@ class Hdcase(Model):
         "date_stop": lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
         "number": _get_number,
         "company_id": lambda *a: get_active_company(),
+        "fee": 1500,
     }
-    _order="date desc,number desc"
+    _order="date_start desc,number desc"
 
 
 
-    def void(self,ids,context={}):
+    def canceled(self,ids,context={}):
         obj=self.browse(ids)[0]
-        obj.write({"state":"voided"})
+        obj.write({"state":"canceled"})
 
 
+    def confirmed(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        obj.write({"state":"confirmed"})
+
+    def payment(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        obj.write({"state":"payment"})
+
+    def approved(self,ids,context={}):
+        for obj in self.browse(ids):
+            user_id=get_active_user()
+            try:
+                set_active_user(1)
+                settings=get_model("clinic.setting").browse(1)
+                reconcile_id=get_model("account.reconcile").create({})
+                if obj.patient_id.type == 'mg':
+                    vals={
+                        "narration": obj.number,
+                        "lines": [
+                            ("create",{
+                                "description": obj.number,
+                                "account_id": settings.ar_mg_id.id,
+                                "debit": obj.amount,
+                                "credit": 0,
+                                "partner_id": settings.mg_partner_id.id,
+                                "due_date": obj.date,
+                                "reconcile_id":reconcile_id,
+                            }),
+                            ("create",{
+                                "description": obj.number,
+                                "account_id": settings.ap_mg_id.id,
+                                "debit": 0,
+                                "credit": obj.amount,
+                            }),
+                        ],
+                        "state": "posted",
+                        "date_posted": obj.date,
+                        "date": obj.date,
+                    }
+                    get_model("account.move").create(vals)
+                elif obj.patient_id.type == 'sc':
+                    vals={
+                        "narration": obj.number,
+                        "lines": [
+                            ("create",{
+                                "description": obj.number,
+                                "account_id": settings.ar_sc_id.id,
+                                "debit": obj.amount,
+                                "credit": 0,
+                                "partner_id": settings.sc_partner_id.id,
+                                "due_date": obj.date,
+                                "reconcile_id":reconcile_id,
+                            }),
+                            ("create",{
+                                "description": obj.number,
+                                "account_id": settings.ap_sc_id.id,
+                                "debit": 0,
+                                "credit": obj.amount,
+                            }),
+                        ],
+                        "state": "posted",
+                        "date_posted": obj.date,
+                        "date": obj.date,
+                    }
+                    get_model("account.move").create(vals)
+                elif obj.patient_id.type == 'nhso':
+                    vals={
+                        "narration": obj.number,
+                        "lines": [
+                            ("create",{
+                                "description": obj.number,
+                                "account_id": settings.ar_nhso_id.id,
+                                "debit": obj.amount,
+                                "credit": 0,
+                                "partner_id": settings.nhso_partner_id.id,
+                                "due_date": obj.date,
+                                "reconcile_id":reconcile_id,
+                            }),
+                            ("create",{
+                                "description": obj.number,
+                                "account_id": settings.ap_nhso_id.id,
+                                "debit": 0,
+                                "credit": obj.amount,
+                            }),
+                        ],
+                        "state": "posted",
+                        "date_posted": obj.date,
+                        "date": obj.date,
+                    }
+                    get_model("account.move").create(vals)
+            finally:
+                set_active_user(user_id)
+            obj.write({"state":"approved","reconcile_id":reconcile_id})
+
+    def journal_report(self,ids,context={}):
+        obj=self.browse(ids[0])
+        move_id = get_model("account.move").search([["narration","=",obj.number]])
+        if not move_id:
+            raise Exception("Order is not post or nove have jounal entry.")
+        return {
+            "next": {
+                "name": "journal_entry",
+                "mode":"form",
+                "active_id":move_id[0],
+            }
+        }
+    
+    def get_total(self,ids,context={}):
+        vals={}
+        for obj in self.browse(ids):
+            total=0
+            amt=0
+            fee=obj.fee
+            for line in obj.lines_detail:
+                total+=line.total
+            amt=total+fee
+            vals[obj.id]={
+                "total": total,
+                "amount": amt,
+            }
+        return vals
+
 Hdcase.register()
diff --git a/clinic/models/clinic_patient.py b/clinic/models/clinic_patient.py
index 2e9dd66..aac1d22 100644
--- a/clinic/models/clinic_patient.py
+++ b/clinic/models/clinic_patient.py
@@ -6,7 +6,7 @@ from netforce.access import get_active_company
 
 class Patient(Model):
     _name="clinic.patient"
-    _string="Partient"
+    _string="Patient"
     _audit_log=True
     _name_field="name"
     _multi_company=True
diff --git a/clinic/models/clinic_setting.py b/clinic/models/clinic_setting.py
new file mode 100644
index 0000000..4c9d05c
--- /dev/null
+++ b/clinic/models/clinic_setting.py
@@ -0,0 +1,22 @@
+from netforce.model import Model, fields, get_model
+from netforce.utils import get_data_path
+import time
+from netforce.access import get_active_user
+from netforce.access import get_active_company
+
+class ClinicSetting(Model):
+    _name="clinic.setting"
+    _string="Setting"
+    _fields={
+        "mg_partner_id": fields.Many2One("partner","Partner Medical Govement"),
+        "ar_mg_id": fields.Many2One("account.account","Account Receivable Medical Govement"),
+        "ap_mg_id": fields.Many2One("account.account","Account Payment Medical Govement"),
+        "nhso_partner_id": fields.Many2One("partner","Partner NHSO 30B"),
+        "ar_nhso_id": fields.Many2One("account.account","Account Receiveble NHSO 30B"),
+        "ap_nhso_id": fields.Many2One("account.account","Account Payment NHSO 30B"),
+        "sc_partner_id": fields.Many2One("partner","Partner Social Security"),
+        "ar_sc_id": fields.Many2One("account.account","Account Receiveble Social Security"),
+        "ap_sc_id": fields.Many2One("account.account","Account Payment Social Security"),
+    }
+
+ClinicSetting.register()
diff --git a/clinic/models/clinic_visit.py b/clinic/models/clinic_visit.py
index 16d9b81..90b995e 100644
--- a/clinic/models/clinic_visit.py
+++ b/clinic/models/clinic_visit.py
@@ -15,9 +15,10 @@ class Visit(Model):
         "patient_id": fields.Many2One("clinic.patient","Patients",required=True,search=True),
         "doctor_id": fields.Many2One("clinic.doctor","Doctor",search=True),
         "nurse_id": fields.Many2One("clinic.nurse","Nurse",search=True),
-        "date": fields.Date("Create Date",required=True,search=True),
-        "department": fields.Char("Department",required=True,search=True),
-        "state": fields.Selection([("draft","Draft"),("pending","Pending"),("confirmed","Confirmed"),("canceled","Canceled")],"Status",required=True),
+        "date": fields.Date("Visit Date",required=True,search=True),
+        "department": fields.Char("Department",required=False,search=True),
+        "cycle": fields.Selection([("1","One"),("2","Two"),("3","Tree"),("4","Four")],"Cycle",required=True),
+        "state": fields.Selection([("pending","Pending"),("confirmed","Confirmed"),("canceled","Canceled")],"Status",required=True),
         "comments": fields.One2Many("message","related_id","Comments"),
         "company_id": fields.Many2One("company","Company"),
     }
@@ -34,18 +35,20 @@ class Visit(Model):
 
 
     _defaults={
-        "state": "draft",
-        "date": lambda *a: time.strftime("%Y-%m-%d"),
+        "state": "pending",
         "number": _get_number,
         "company_id": lambda *a: get_active_company(),
     }
-    _order="date desc,number desc"
+    _order="date asc,cycle asc"
 
 
-
-    def void(self,ids,context={}):
+    def confirmed(self,ids,context={}):
         obj=self.browse(ids)[0]
-        obj.write({"state":"voided"})
+        obj.write({"state":"confirmed"})
+
+    def canceled(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        obj.write({"state":"canceled"})
 
 
 Visit.register()