diff --git a/netforce_clinic/layouts/clinic_make_apt.xml b/netforce_clinic/layouts/clinic_make_apt.xml
index f6a1c99..e147a72 100644
--- a/netforce_clinic/layouts/clinic_make_apt.xml
+++ b/netforce_clinic/layouts/clinic_make_apt.xml
@@ -3,9 +3,9 @@
     <field name="date" span="2" mode="month" onchange="onchange_date"/>
     <field name="date_from" span="2"/>
     <field name="date_to" span="2"/>
-    <field name="department_id" span="2"/>
-    <field name="branch_id" span="2"/>
     <field name="cycle_id" span="2"/>
+    <field name="branch_id" span="2"/>
+    <field name="department_id" domain='[["branch_id","=",branch_id]]' span="2"/>
     <field name="lines" nolabel="1">
         <list>
             <field name="patient_id"/>
diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index 14622af..d9974e1 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -116,9 +116,9 @@
     </tabs>
     <related>
         <field name="addresses"/>
-        <field name="visits"/>
-        <field name="hd_cases"/>
-        <field name="dialyzers"/>
+        <field name="visits" readonly="1"/>
+        <field name="hd_cases" readonly="1"/>
+        <field name="dialyzers" readonly="1"/>
         <field name="documents"/>
         <field name="comments"/>
     </related>
diff --git a/netforce_clinic/layouts/clinic_staff_form.xml b/netforce_clinic/layouts/clinic_staff_form.xml
index 4e663f7..c8a30b4 100644
--- a/netforce_clinic/layouts/clinic_staff_form.xml
+++ b/netforce_clinic/layouts/clinic_staff_form.xml
@@ -64,7 +64,7 @@
                 <field name="note"/>
             </list>
         </field>
-        <field name="hd_case_staffs" attrs='{"invisible":[["type","=","nurse"]]}'>
+        <field name="hd_case_staffs" readonly="1" attrs='{"invisible":[["type","=","nurse"]]}'>
             <list colors='{"#cfc":[["state","=","completed"]],"#f9e37d":[["state","=","in_progress"]],"#bcbbb9":[["state","=","cancelled"]],"#ACD1E9":[["state","=","waiting_payment"]],"#70DB93":[["state","=","paid"]]}'>
                 <field name="hd_case_id"/>
                 <field name="date"/>
@@ -79,7 +79,7 @@
                 <field name="hd_case_id"/>
             </form>
         </field>
-        <field name="cycle_item_nurses" attrs='{"invisible":[["type","=","doctor"]]}'>
+        <field name="cycle_item_nurses" readonly="1" attrs='{"invisible":[["type","=","doctor"]]}'>
             <list>
                 <field name="cycle_item_id"/>
             </list>
@@ -87,7 +87,7 @@
                 <field name="cycle_item_id"/>
             </form>
         </field>
-        <field name="patients"/>
+        <field name="patients" readonly="1"/>
         <field name="comments"/>
     </related>
 </form>
diff --git a/netforce_clinic/models/cycle_item_copy.py b/netforce_clinic/models/cycle_item_copy.py
index 9925fba..e9e8536 100644
--- a/netforce_clinic/models/cycle_item_copy.py
+++ b/netforce_clinic/models/cycle_item_copy.py
@@ -79,32 +79,13 @@ class CycleItemCopy(Model):
         for line in item.lines:
             line.delete()
         lines=[]
-        if obj.choice=='item':
-            for line in obj.item_copy_id.lines:
-                nr=line.nurse_id
-                lines.append(('create', {
-                    'nurse_id': nr.id,
-                    'level_id': nr.level_id.id,
-                    'state': nr.state,
-                }))
-        elif obj.choice=='schd':
-            for line in obj.schd_copy_id.lines:
-                nr=line.nurse_id
-                cycle=line.cycle_id
-                if item.cycle_id.id==cycle.id:
-                    lines.append(('create', {
-                        'nurse_id': nr.id,
-                        'level_id': nr.level_id.id,
-                        'state': nr.state,
-                    }))
-        else:
-            for line in obj.lines:
-                nr=line.nurse_id
-                lines.append(('create', {
-                    'nurse_id': nr.id,
-                    'level_id': nr.level_id.id,
-                    'state': nr.state,
-                }))
+        for line in obj.lines:
+            nr=line.nurse_id
+            lines.append(('create', {
+                'nurse_id': nr.id,
+                'level_id': nr.level_id.id,
+                'state': nr.state,
+            }))
         item.write({
             'lines': lines,
         })
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index 0055103..e51b350 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -55,8 +55,8 @@ class Patient(Model):
         "age": fields.Integer("Age", function="_get_age"),
         'image': fields.File("Image"),
         'email': fields.Char("Email"),
-        "weight": fields.Float("Weight (cm)"),
-        "height": fields.Float("Height (Kg)"),
+        "weight": fields.Float("Weight (kg.)"),
+        "height": fields.Float("Height (cm.)"),
         "card_type": fields.Selection([("identification","Identification"),("passport","Passport")],"Card Type"),
         'card_no' : fields.Char("Card Number"),
         'card_exp' : fields.Date("Card Expire"),
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index c055849..502f942 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -266,7 +266,7 @@ class Visit(Model):
                 ['department_id','=',department.id],
                 ['cycle_id','=',cycle.id],
             ]
-            for item2 in get_model("clinic.cycle.item").search_browse([]):
+            for item2 in get_model("clinic.cycle.item").search_browse(dom):
                 lines=[]
                 for line in item2.lines:
                     nr=line.nurse_id
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 97f2ec3..15c46bc 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,4 +1,12 @@
 todo:
+    - filter product by
+        1. company
+        2. category
+        3. code
+    - cycle item
+         - copy nurse only in the list
+         - problem after confirm visit
+
    - import hd case ***
         - add script
    - report 
@@ -7,9 +15,9 @@ todo:
         - working status 
    - matching payment ***
 
-   - popup messagging -> Ask DJ
-   - modify message of log -> Ask DJ
    - show image of staff -> 
+   - popup messagging -> Ask DK -> ok
+   - modify message of log -> Ask DJ -> ok
    - copy old nurse from previous cycle item -> ok
    - multi confirm on visit board **** -> ok
 =======