From cbde2cc6ff5a031a2c821e1537704566b58a7399 Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Fri, 9 Jan 2015 12:19:52 +0700 Subject: [PATCH] show company --- .../layouts/clinic_contact_form.xml | 2 + netforce_clinic/layouts/clinic_cycle_form.xml | 3 +- .../layouts/clinic_cycle_item_form.xml | 22 +--- .../layouts/clinic_dialyzer_form.xml | 1 + .../layouts/clinic_hd_case_form.xml | 9 +- .../layouts/clinic_hd_case_list.xml | 1 + netforce_clinic/layouts/clinic_menu.xml | 16 +-- .../layouts/clinic_menu_inherit.xml | 4 +- .../layouts/clinic_patient_form.xml | 9 +- .../layouts/clinic_patient_list.xml | 5 +- .../layouts/clinic_patient_type_form.xml | 3 +- .../layouts/clinic_patient_type_list.xml | 2 +- .../layouts/clinic_schedule_form.xml | 1 + netforce_clinic/layouts/clinic_setting.xml | 12 +- .../layouts/clinic_sickbed_form.xml | 3 +- .../layouts/clinic_sickbed_list.xml | 8 +- .../layouts/clinic_staff_categ_form.xml | 3 +- netforce_clinic/layouts/clinic_staff_form.xml | 5 +- .../layouts/clinic_staff_level_form.xml | 3 +- netforce_clinic/layouts/clinic_staff_list.xml | 1 + .../layouts/clinic_staff_rotate_form.xml | 3 +- .../layouts/clinic_visit_board.xml | 3 +- .../layouts/clinic_visit_calendar.xml | 3 +- netforce_clinic/layouts/clinic_visit_form.xml | 1 + .../layouts/fin_clinic_settings.xml | 2 +- netforce_clinic/models/cycle.py | 1 + netforce_clinic/models/cycle_item.py | 1 + netforce_clinic/models/hd_case.py | 108 ++++++++++++++---- netforce_clinic/models/hd_case_line.py | 1 + netforce_clinic/models/hd_case_payment.py | 13 ++- netforce_clinic/models/import_payment.py | 14 +-- netforce_clinic/models/import_uc.py | 6 +- netforce_clinic/models/import_visit.py | 14 +-- netforce_clinic/models/patient.py | 30 ++--- netforce_clinic/models/patient_type.py | 6 +- .../models/report_payment_matching.py | 4 +- netforce_clinic/models/schedule_copy.py | 9 +- netforce_clinic/models/setting_product.py | 9 +- netforce_clinic/models/sickbed.py | 26 +++++ netforce_clinic/models/staff.py | 2 +- netforce_clinic/models/staff_categ.py | 1 + netforce_clinic/models/staff_level.py | 2 + netforce_clinic/models/staff_rotation.py | 1 + netforce_clinic/models/visit.py | 36 +++--- netforce_clinic/todo.txt | 11 +- 45 files changed, 259 insertions(+), 161 deletions(-) diff --git a/netforce_clinic/layouts/clinic_contact_form.xml b/netforce_clinic/layouts/clinic_contact_form.xml index d03bd6f..c932e30 100644 --- a/netforce_clinic/layouts/clinic_contact_form.xml +++ b/netforce_clinic/layouts/clinic_contact_form.xml @@ -1,4 +1,5 @@ + diff --git a/netforce_clinic/layouts/clinic_cycle_form.xml b/netforce_clinic/layouts/clinic_cycle_form.xml index c504e9b..a00db58 100644 --- a/netforce_clinic/layouts/clinic_cycle_form.xml +++ b/netforce_clinic/layouts/clinic_cycle_form.xml @@ -1,4 +1,4 @@ -
+ @@ -10,6 +10,7 @@ + diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml index 9a774d2..d333d84 100644 --- a/netforce_clinic/layouts/clinic_cycle_item_form.xml +++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml @@ -10,28 +10,8 @@ + - diff --git a/netforce_clinic/layouts/clinic_dialyzer_form.xml b/netforce_clinic/layouts/clinic_dialyzer_form.xml index 700ff3d..c546d10 100644 --- a/netforce_clinic/layouts/clinic_dialyzer_form.xml +++ b/netforce_clinic/layouts/clinic_dialyzer_form.xml @@ -18,6 +18,7 @@ + - + @@ -28,7 +28,7 @@ - + @@ -41,6 +41,7 @@ + @@ -98,7 +99,7 @@ - + diff --git a/netforce_clinic/layouts/clinic_patient_list.xml b/netforce_clinic/layouts/clinic_patient_list.xml index a12e069..1729196 100644 --- a/netforce_clinic/layouts/clinic_patient_list.xml +++ b/netforce_clinic/layouts/clinic_patient_list.xml @@ -4,11 +4,12 @@ - + + - + diff --git a/netforce_clinic/layouts/clinic_patient_type_form.xml b/netforce_clinic/layouts/clinic_patient_type_form.xml index 1d77f04..d1473fb 100644 --- a/netforce_clinic/layouts/clinic_patient_type_form.xml +++ b/netforce_clinic/layouts/clinic_patient_type_form.xml @@ -1,4 +1,4 @@ - +