diff --git a/netforce_clinic/layouts/clinic_shop_form.xml b/netforce_clinic/layouts/clinic_shop_form.xml
index 90eb7a9..2073fb2 100644
--- a/netforce_clinic/layouts/clinic_shop_form.xml
+++ b/netforce_clinic/layouts/clinic_shop_form.xml
@@ -17,10 +17,10 @@
         <field name="branch_id" span="2"/>
         <field name="department_id" domain='[["branch_id","=",branch_id]]' span="2"/>
         <field name="pay_type" span="2"/>
-        <field name="pay_date" span="2" attrs='{"invisible":[["pay_type","=","credit"]],"readonly":[["state","=","blabla"]]}'/>
-        <field name="cheque_no" span="2" attrs='{"invisible":[["pay_type","=","credit"]],"readonly":[["state","=","blabla"]]}'/>
-        <field name="bank_name" span="2" attrs='{"invisible":[["pay_type","=","credit"]],"readonly":[["state","=","blabla"]]}'/>
-        <field name="bank_branch" span="2" attrs='{"invisible":[["pay_type","=","credit"]],"readonly":[["state","=","blabla"]]}'/>
+        <field name="pay_date" span="2"/>
+        <field name="cheque_no" span="2"/>
+        <field name="bank_name" span="2"/>
+        <field name="bank_branch" span="2"/>
         <field name="hd_case_call" invisible="1"/>
         <field name="shop_categs" invisible="1"/>
         <field name="company_id" invisible="1"/>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 77bd07f..a0f1251 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -121,5 +121,4 @@ from . import select_company
 from . import name_title
 from . import compute_labor_cost
 from . import login
-from . import address
 from . import sequence
diff --git a/netforce_clinic/models/dialyzer.py b/netforce_clinic/models/dialyzer.py
index 0613afe..9afe046 100644
--- a/netforce_clinic/models/dialyzer.py
+++ b/netforce_clinic/models/dialyzer.py
@@ -166,7 +166,11 @@ class Dialyzer(Model):
             }
             pick_vals["lines"].append(("create",line_vals))
             picking_obj=get_model("stock.picking")
-            pick_id=picking_obj.create(pick_vals,context={"pick_type": "out"})
+            context={
+                'pick_type': 'out',
+                'journal_id': pick_vals['journal_id'],
+            }
+            pick_id=picking_obj.create(pick_vals,context=context)
             pick=picking_obj.browse(pick_id)
             pick.set_done([pick_id])
         number=obj.number.replace("/","")
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 8eddc2c..43626cd 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -690,7 +690,11 @@ class HDCase(Model):
                 "flash": "Nothing left to deliver",
             }
         picking_obj=get_model("stock.picking")
-        pick_id=picking_obj.create(pick_vals,context={"pick_type": "out"})
+        context={
+            'pick_type': 'out',
+            'journal_id': pick_vals['journal_id'],
+        }
+        pick_id=picking_obj.create(pick_vals,context=context)
         pick=picking_obj.browse(pick_id)
         pick.set_done([pick_id])
 
diff --git a/netforce_clinic/models/shop.py b/netforce_clinic/models/shop.py
index 549c857..82d9d7c 100644
--- a/netforce_clinic/models/shop.py
+++ b/netforce_clinic/models/shop.py
@@ -386,7 +386,11 @@ class Shop(Model):
                 "flash": "Nothing left to deliver",
             }
         picking_obj=get_model("stock.picking")
-        pick_id=picking_obj.create(pick_vals,context={"pick_type": "out"})
+        context={
+            'pick_type': 'out',
+            'journal_id': pick_vals['journal_id'],
+        }
+        pick_id=picking_obj.create(pick_vals,context=context)
         pick=picking_obj.browse(pick_id)
         pick.set_done([pick_id])
 
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 93e68d0..83a1ba0 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -4,3 +4,8 @@
 - merge data
     - patient
     - doctor
+
+====
+ต้องมี เมนู 
+1. ย้ายผู้ป่วย
+2. ปรับ level