From 719389f5f6273a39c65c6703fe85b228750150f8 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 27 Nov 2014 10:50:13 +0700
Subject: [PATCH] branch

---
 netforce_clinic/actions/clinic_branch.xml       |  6 ++++++
 netforce_clinic/layouts/clinic_branch_form.xml  |  4 ++++
 netforce_clinic/layouts/clinic_branch_list.xml  |  4 ++++
 netforce_clinic/layouts/clinic_menu.xml         |  1 +
 netforce_clinic/layouts/clinic_patient_form.xml |  1 +
 netforce_clinic/layouts/clinic_patient_list.xml |  3 ++-
 netforce_clinic/models/__init__.py              |  1 +
 netforce_clinic/models/branch.py                | 12 ++++++++++++
 netforce_clinic/models/patient.py               |  3 ++-
 9 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_branch.xml
 create mode 100644 netforce_clinic/layouts/clinic_branch_form.xml
 create mode 100644 netforce_clinic/layouts/clinic_branch_list.xml
 create mode 100644 netforce_clinic/models/branch.py

diff --git a/netforce_clinic/actions/clinic_branch.xml b/netforce_clinic/actions/clinic_branch.xml
new file mode 100644
index 0000000..abcaa30
--- /dev/null
+++ b/netforce_clinic/actions/clinic_branch.xml
@@ -0,0 +1,6 @@
+<action>
+    <field name="string">Branch</field>
+    <field name="view_cls">multi_view</field>
+    <field name="model">clinic.branch</field>
+    <field name="menu">clinic_menu</field>
+</action>
diff --git a/netforce_clinic/layouts/clinic_branch_form.xml b/netforce_clinic/layouts/clinic_branch_form.xml
new file mode 100644
index 0000000..98d4f3c
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_branch_form.xml
@@ -0,0 +1,4 @@
+<form model="clinic.branch">
+    <field name="name"/>
+    <field name="parent_id"/>
+</form>
diff --git a/netforce_clinic/layouts/clinic_branch_list.xml b/netforce_clinic/layouts/clinic_branch_list.xml
new file mode 100644
index 0000000..c77373f
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_branch_list.xml
@@ -0,0 +1,4 @@
+<list model="clinic.branch">
+    <field name="name"/>
+    <field name="parent_id"/>
+</list>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index ac0beb2..b610016 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -55,6 +55,7 @@
         <!--<item string="Special Nurse" action="clinic_report_nurse_special"/>-->
     </item>
     <item string="Settings">
+        <item string="Branch" action="clinic_branch"/>
         <item string="Departments" action="clinic_department"/>
         <item string="Nationalities" action="clinic_nation"/>
         <item string="Clinic Settings" action="clinic_setting"/>
diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index 7a91662..4445af6 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -15,6 +15,7 @@
     <field name="partner_id"/>
     <field name="categ_id"/>
     <field name="doctor_id"/>
+    <field name="branch_id"/>
     <tabs>
         <tab string="General Information">
             <group span="6" columns="1">
diff --git a/netforce_clinic/layouts/clinic_patient_list.xml b/netforce_clinic/layouts/clinic_patient_list.xml
index 2e62a45..ad6d092 100644
--- a/netforce_clinic/layouts/clinic_patient_list.xml
+++ b/netforce_clinic/layouts/clinic_patient_list.xml
@@ -5,8 +5,9 @@
     <field name="number"/>
     <field name="hn"/>
     <field name="name"/>
+    <field name="branch_id"/>
     <field name="reg_date"/>
-    <field name="resign_date"/>
+    <!--<field name="resign_date"/>-->
     <field name="categ_id"/>
     <field name="type"/>
 </list>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 8b369ae..1ea8fa6 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -62,3 +62,4 @@ from . import report_recent_patient
 from . import report_discontinue_patient
 from . import report_nurse_fee_sum
 from . import report_nurse_fee_detail
+from . import branch
diff --git a/netforce_clinic/models/branch.py b/netforce_clinic/models/branch.py
new file mode 100644
index 0000000..672d15e
--- /dev/null
+++ b/netforce_clinic/models/branch.py
@@ -0,0 +1,12 @@
+from netforce.model import Model, fields
+
+class Branch(Model):
+    _name="clinic.branch"
+    _string="Branch"
+    _key=['name']
+    _fields={
+        "name": fields.Char("Name",required=True,search=True),
+        "parent_id": fields.Many2One("clinic.branch","Parent"),
+    }
+
+Branch.register()
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index de5d8f7..79e07f3 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -14,7 +14,7 @@ class Patient(Model):
     _string="Patient"
     _audit_log=True
     _multi_company=True
-    _key=["name"]
+    _key=["number,name"]
 
     def _get_age(self,ids,context):
         res={}
@@ -82,6 +82,7 @@ class Patient(Model):
         "documents": fields.One2Many("document","related_id","Documents"),
         'resign_date': fields.Date("Resign Date"),
         'rm_remain_visit': fields.Boolean("Auto Remove Remaining Visit"),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
 
     def _get_number(self,context={}):