From 391721bb19bf9f83d954d1d23048e41e6b58a971 Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Mon, 29 Jun 2015 11:39:12 +0700 Subject: [PATCH] merge staff --- .../actions/clinic_merge_staff.xml | 8 +++ netforce_clinic/layouts/clinic_menu.xml | 3 +- .../layouts/clinic_merge_staff.xml | 11 ++++ netforce_clinic/models/setting.py | 54 +++++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 netforce_clinic/actions/clinic_merge_staff.xml create mode 100644 netforce_clinic/layouts/clinic_merge_staff.xml diff --git a/netforce_clinic/actions/clinic_merge_staff.xml b/netforce_clinic/actions/clinic_merge_staff.xml new file mode 100644 index 0000000..fd9cde1 --- /dev/null +++ b/netforce_clinic/actions/clinic_merge_staff.xml @@ -0,0 +1,8 @@ + + form_view + clinic.setting + 1 + clinic_merge_staff + clinic_menu + + diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 6f37415..d6aa7bc 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -52,12 +52,13 @@ + + - diff --git a/netforce_clinic/layouts/clinic_merge_staff.xml b/netforce_clinic/layouts/clinic_merge_staff.xml new file mode 100644 index 0000000..faf6ea8 --- /dev/null +++ b/netforce_clinic/layouts/clinic_merge_staff.xml @@ -0,0 +1,11 @@ +
+ +