From f32fd7dc19c38c3f3c77edac9e85baacd3a274c8 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Fri, 13 Feb 2015 14:46:39 +0700 Subject: [PATCH] hct improve --- .../layouts/clinic_contact_form.xml | 18 +-- .../layouts/clinic_hd_case_form.xml | 1 - netforce_clinic/layouts/clinic_shop_form.xml | 18 ++- netforce_clinic/layouts/clinic_shop_list.xml | 3 + .../layouts/fin_clinic_settings.xml | 8 -- .../layouts/org_clinic_settings.xml | 5 + netforce_clinic/models/hd_case.py | 17 ++- netforce_clinic/models/partner.py | 7 +- netforce_clinic/models/patient.py | 2 + netforce_clinic/models/setting.py | 17 +-- netforce_clinic/models/shop.py | 64 ++++++++- netforce_clinic/models/utils.py | 123 ++++++++++++++++++ netforce_clinic/reports/cust_payment.odt | Bin 30235 -> 32639 bytes .../templates/report_labor_cost_summary.hbs | 32 +++-- 14 files changed, 251 insertions(+), 64 deletions(-) delete mode 100644 netforce_clinic/layouts/fin_clinic_settings.xml create mode 100644 netforce_clinic/layouts/org_clinic_settings.xml diff --git a/netforce_clinic/layouts/clinic_contact_form.xml b/netforce_clinic/layouts/clinic_contact_form.xml index c932e30..8f1ec91 100644 --- a/netforce_clinic/layouts/clinic_contact_form.xml +++ b/netforce_clinic/layouts/clinic_contact_form.xml @@ -1,13 +1,9 @@ - + + + + + + + diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml index a34f7dd..2e84270 100644 --- a/netforce_clinic/layouts/clinic_hd_case_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_form.xml @@ -3,7 +3,6 @@ diff --git a/netforce_clinic/layouts/clinic_shop_form.xml b/netforce_clinic/layouts/clinic_shop_form.xml index 19643e7..d8243e5 100644 --- a/netforce_clinic/layouts/clinic_shop_form.xml +++ b/netforce_clinic/layouts/clinic_shop_form.xml @@ -1,7 +1,7 @@
- @@ -9,11 +9,16 @@ - + + + + + + @@ -36,16 +41,19 @@ + + + - -