diff --git a/netforce_clinic/layouts/clinic_department_form.xml b/netforce_clinic/layouts/clinic_department_form.xml
index 89e6af3..d49af1c 100644
--- a/netforce_clinic/layouts/clinic_department_form.xml
+++ b/netforce_clinic/layouts/clinic_department_form.xml
@@ -1,8 +1,8 @@
 <form model="clinic.department" show_company="1">
     <field name="name"/>
-    <field name="code"/>
-    <field name="pick_out_journal_id"/>
+    <!--<field name="code"/>-->
     <field name="parent_id"/>
+    <field name="pick_out_journal_id"/>
     <field name="branch_id"/>
     <field name="company_id" invisible="1"/>
 </form>
diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml
index 2bdff22..9e16a2d 100644
--- a/netforce_clinic/layouts/clinic_setting.xml
+++ b/netforce_clinic/layouts/clinic_setting.xml
@@ -25,6 +25,7 @@
                 </field>
            </group>
         </tab>
+        <!--
         <tab string="Dialyzer">
             <field name="stock_journal_id"/>
         </tab>
@@ -34,7 +35,6 @@
             <field name="schd_to"/>
             <button string="Transfer" type="primary" icon="arrow-right" method="schd_confirm"/>
         </tab>
-        <!--
         <tab string="Testing">
             <button string="Dummy" type="default" method="run_script"/>
             <button string="Reset Import" icon="repeat" type="default" method="reset_last_import"/>
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index 75f5927..cac58d1 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -192,6 +192,8 @@ class Patient(Model):
             if not vals['active']:
                 vals['resign_date']=time.strftime("%Y-%m-%d")
         for obj in self.browse(ids):
+            if not obj.addresses:
+                raise Exception("Address not found - %s!"%obj.name)
             partner_id=obj.partner_id
             if not partner_id:
                 for partner in get_model("partner").search_browse([['name', '=', obj.name]]):
diff --git a/netforce_clinic/sql_reset.txt b/netforce_clinic/sql_reset.txt
new file mode 100644
index 0000000..c11047d
--- /dev/null
+++ b/netforce_clinic/sql_reset.txt
@@ -0,0 +1,5 @@
+TRUNCATE stock_picking restart identity cascade;
+TRUNCATE stock_balance restart identity cascade;
+TRUNCATE clinic_visit restart identity cascade;
+TRUNCATE clinic_cycle_item restart identity cascade;
+TRUNCATE clinic_schedule restart identity cascade;