From d2e0bd55c24ff77abb6b02f7aa35197b7b183e18 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Tue, 28 Oct 2014 02:01:18 +0700 Subject: [PATCH] import payment --- netforce_clinic/actions/clinic_data_sc.xml | 2 +- .../layouts/clinic_data_sc_form.xml | 1 + .../layouts/clinic_data_sc_list.xml | 3 +- .../layouts/clinic_input_data_form.xml | 6 - .../layouts/clinic_patient_form.xml | 3 +- netforce_clinic/layouts/clinic_setting.xml | 7 +- netforce_clinic/layouts/import_clinic_sc.xml | 3 + netforce_clinic/models/__init__.py | 4 +- netforce_clinic/models/cycle_item.py | 3 +- netforce_clinic/models/file_sheet.py | 14 --- netforce_clinic/models/hd_case.py | 7 +- netforce_clinic/models/import_data_sc.py | 5 +- netforce_clinic/models/import_payment.py | 79 +++++++++++- netforce_clinic/models/input_data.py | 18 --- netforce_clinic/models/patient.py | 44 +++++++ netforce_clinic/models/setting.py | 118 +++++++++++++----- netforce_clinic/models/visit.py | 13 ++ 17 files changed, 247 insertions(+), 83 deletions(-) delete mode 100644 netforce_clinic/layouts/clinic_input_data_form.xml delete mode 100644 netforce_clinic/models/file_sheet.py delete mode 100644 netforce_clinic/models/input_data.py diff --git a/netforce_clinic/actions/clinic_data_sc.xml b/netforce_clinic/actions/clinic_data_sc.xml index bd2364f..ea766c8 100644 --- a/netforce_clinic/actions/clinic_data_sc.xml +++ b/netforce_clinic/actions/clinic_data_sc.xml @@ -1,7 +1,7 @@ Social Security multi_view - [["All",[]],["Success",[["type","=","success"]]],["Fail",[["type","=","fail"]]]] + [["All",[]],["Match",[["type","=","match"]]],["Not Match",[["type","=","not_match"]]]] clinic.data.sc account_menu diff --git a/netforce_clinic/layouts/clinic_data_sc_form.xml b/netforce_clinic/layouts/clinic_data_sc_form.xml index 62b6553..fc67863 100644 --- a/netforce_clinic/layouts/clinic_data_sc_form.xml +++ b/netforce_clinic/layouts/clinic_data_sc_form.xml @@ -11,4 +11,5 @@ + diff --git a/netforce_clinic/layouts/clinic_data_sc_list.xml b/netforce_clinic/layouts/clinic_data_sc_list.xml index a4e40ca..6eb8467 100644 --- a/netforce_clinic/layouts/clinic_data_sc_list.xml +++ b/netforce_clinic/layouts/clinic_data_sc_list.xml @@ -1,4 +1,4 @@ - + @@ -11,4 +11,5 @@ + diff --git a/netforce_clinic/layouts/clinic_input_data_form.xml b/netforce_clinic/layouts/clinic_input_data_form.xml deleted file mode 100644 index 89d5e99..0000000 --- a/netforce_clinic/layouts/clinic_input_data_form.xml +++ /dev/null @@ -1,6 +0,0 @@ -
- - - - - diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml index a8a10b1..dbc144c 100644 --- a/netforce_clinic/layouts/clinic_patient_form.xml +++ b/netforce_clinic/layouts/clinic_patient_form.xml @@ -3,7 +3,8 @@ diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml index fcc4564..d97ef89 100644 --- a/netforce_clinic/layouts/clinic_setting.xml +++ b/netforce_clinic/layouts/clinic_setting.xml @@ -3,12 +3,15 @@ -