diff --git a/netforce_clinic/layouts/clinic_branch_form.xml b/netforce_clinic/layouts/clinic_branch_form.xml
index 98d4f3c..7c4a6de 100644
--- a/netforce_clinic/layouts/clinic_branch_form.xml
+++ b/netforce_clinic/layouts/clinic_branch_form.xml
@@ -1,4 +1,5 @@
 <form model="clinic.branch">
     <field name="name"/>
     <field name="parent_id"/>
+    <field name="pick_out_journal_id"/>
 </form>
diff --git a/netforce_clinic/layouts/clinic_department_form.xml b/netforce_clinic/layouts/clinic_department_form.xml
index d6385b3..c2726bb 100644
--- a/netforce_clinic/layouts/clinic_department_form.xml
+++ b/netforce_clinic/layouts/clinic_department_form.xml
@@ -1,5 +1,7 @@
-<form model="clinic.department">
+<form model="clinic.department" show_company="1">
     <field name="name"/>
     <field name="code"/>
     <field name="parent_id"/>
+    <field name="branch_id"/>
+    <field name="company_id" invisible="1"/>
 </form>
diff --git a/netforce_clinic/layouts/clinic_department_list.xml b/netforce_clinic/layouts/clinic_department_list.xml
index d32d65c..521b693 100644
--- a/netforce_clinic/layouts/clinic_department_list.xml
+++ b/netforce_clinic/layouts/clinic_department_list.xml
@@ -2,4 +2,5 @@
     <field name="name"/>
     <field name="code"/>
     <field name="parent_id"/>
+    <field name="branch_id"/>
 </list>
diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml
index 354a1fc..b22be34 100644
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_form.xml
@@ -15,6 +15,7 @@
         <field name="department_id" span="2"/>
         <field name="cycle_item_id" span="2" domain="[['cycle_id','=',cycle_id]]"/>
         <field name="visit_id" span="2"/>
+        <field name="branch_id" span="2"/>
         <field name="req_fee" span="2" invisible="1"/>
         <!-- enable show_company=1 -->
         <field name="company_id" span="2" invisible="1"/>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 3518c64..1c8b63d 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -25,14 +25,14 @@
         <item string="Races" action="clinic_race"/>
         <item string="Morbidities" action="clinic_morbidity"/>
     </item>
-    <item string="Cycles" perm="clinic_cycle">
-        <item string="Cycles" action="clinic_cycle"/>
-        <item string="Cycle Items" action="clinic_cycle_item"/>
-    </item>
     <item string="Schedules" action="clinic_schedule" perm="clinic_schedule">
         <item string="Schedules" action="clinic_schedule"/>
         <item string="Schedules Board" action="clinic_schedule_board"/>
     </item>
+    <item string="Cycles" perm="clinic_cycle">
+        <item string="Cycles" action="clinic_cycle"/>
+        <item string="Cycle Items" action="clinic_cycle_item"/>
+    </item>
     <item string="Visits" perm="clinic_visit">
         <item string="Visits" action="clinic_visit"/>
         <item string="Visit Board" action="clinic_visit_board"/>
@@ -40,8 +40,10 @@
     <item string="HD Cases" perm="clinic_hdcase">
         <item string="HD Cases" action="clinic_hd_case"/>
         <divider/>
-        <header string="OTHERS"/>
+        <header string="SETTINGS"/>
         <item string="Sickbed" action="clinic_sickbed"/>
+        <item string="Departments" action="clinic_department"/>
+        <item string="Valcular Access" action="clinic_vascular_access"/>
     </item>
     <item string="Reports" perm="clinic_report">
         <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
@@ -51,10 +53,8 @@
     </item>
     <item string="Settings" perm="clinic_settings">
         <item string="Branch" action="clinic_branch"/>
-        <item string="Departments" action="clinic_department"/>
         <item string="Hospital" action="clinic_hospital"/>
         <item string="Nationalities" action="clinic_nation"/>
-        <item string="Valcular Access" action="clinic_vascular_access"/>
         <item string="Clinic Settings" action="clinic_setting"/>
     </item>
 </menu>
diff --git a/netforce_clinic/layouts/clinic_visit_form.xml b/netforce_clinic/layouts/clinic_visit_form.xml
index 4ef1eb7..54be576 100644
--- a/netforce_clinic/layouts/clinic_visit_form.xml
+++ b/netforce_clinic/layouts/clinic_visit_form.xml
@@ -15,6 +15,7 @@
                 <field name="time_start" onchange="onchange_datefrom"/>
                 <field name="cycle_id" onchange="onchange_cycle" required="1"/>
                 <field name="department_id"/>
+                <field name="branch_id"/>
             </group>
             <group span="6" columns="1">
                 <field name="patient_id" onchange="onchange_patient"/>
diff --git a/netforce_clinic/models/branch.py b/netforce_clinic/models/branch.py
index 672d15e..05cb1f0 100644
--- a/netforce_clinic/models/branch.py
+++ b/netforce_clinic/models/branch.py
@@ -7,6 +7,7 @@ class Branch(Model):
     _fields={
         "name": fields.Char("Name",required=True,search=True),
         "parent_id": fields.Many2One("clinic.branch","Parent"),
+        "pick_out_journal_id": fields.Many2One("stock.journal","Goods Issue Journal"),
     }
 
 Branch.register()
diff --git a/netforce_clinic/models/cycle.py b/netforce_clinic/models/cycle.py
index 0f49c4f..03fe034 100644
--- a/netforce_clinic/models/cycle.py
+++ b/netforce_clinic/models/cycle.py
@@ -41,13 +41,14 @@ class Cycle(Model):
         'sequence': fields.Integer("Sequence"),
         'time_start': fields.Char("Start Time"),
         'time_stop': fields.Char("End Time"),
-        'company_id': fields.Many2One("company", "Company"),
         'hd_cases': fields.One2Many("clinic.hd.case","cycle_id", "HD Cases"),
         'visits': fields.One2Many("clinic.visit","cycle_id", "Visits"),
         'cycle_items': fields.One2Many("clinic.cycle.item","cycle_id", "Cycle Items"),
         'var_k': fields.Float("K"),
         'color': fields.Char("Color"),
         'note': fields.Text("Note"),
+        'company_id': fields.Many2One("company", "Company"),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
 
     _defaults={
diff --git a/netforce_clinic/models/cycle_item.py b/netforce_clinic/models/cycle_item.py
index 55fefa2..b3aa08b 100644
--- a/netforce_clinic/models/cycle_item.py
+++ b/netforce_clinic/models/cycle_item.py
@@ -34,10 +34,11 @@ class CycleItem(Model):
         'nurses': fields.One2Many("clinic.cycle.item.nurse",'cycle_item_id','Nurses'),
         'nurse_id': fields.Many2One("clinic.staff","Nurse",domain=[['type','=','nurse']]),
         'sequence': fields.Char("Sequence",function="_get_all",function_multi=True,store=True),
-        'company_id': fields.Many2One("company", "Company"),
         "state": fields.Selection([("draft","Draft"),("validated","Validated")],"Status",required=True),
         'user_id': fields.Many2One("base.user","Validator"),
         "comments": fields.One2Many("message","related_id","Comments"), "company_id": fields.Many2One("company","Company"),
+        'company_id': fields.Many2One("company", "Company"),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
     
     def _get_vark(self,context={}):
diff --git a/netforce_clinic/models/department.py b/netforce_clinic/models/department.py
index 0101262..24daeec 100644
--- a/netforce_clinic/models/department.py
+++ b/netforce_clinic/models/department.py
@@ -10,6 +10,8 @@ class Department(Model):
         "name": fields.Char("Name",required=True,search=True),
         "code": fields.Char("Code",search=True),
         "parent_id": fields.Many2One("clinic.department", "Parent"),
+        'company_id': fields.Many2One("company","Company"),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
 
     _defaults={
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index f28b67b..1a191e9 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -115,6 +115,7 @@ class HDCase(Model):
         'req_fee': fields.Integer("Request Expense"),
         'hd_case_id': fields.Many2One("clinic.hd.case","HD",function="_get_all",function_multi=True), # XXX
         'company_id': fields.Many2One("company","Company"),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
 
     def _get_number(self,context={}):
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index 4df3663..64bd410 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -51,6 +51,7 @@ class Visit(Model):
         'visit_date': fields.Date('Visit Date'),
         'cycle_color': fields.Char('Color',function="_get_all",function_multi=True,store=True),
         'note': fields.Text('Note'),
+        'branch_id': fields.Many2One("clinic.branch","Branch"),
     }
 
     def _get_number(self,context={}):