diff --git a/netforce_clinic/actions/clinic_round.xml b/netforce_clinic/actions/clinic_round.xml
deleted file mode 100644
index d0f1103..0000000
--- a/netforce_clinic/actions/clinic_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<action>
-    <field name="string">Nationalities</field>
-    <field name="view_cls">multi_view</field>
-    <field name="model">clinic.round</field>
-    <field name="menu">clinic_menu</field>
-</action>
diff --git a/netforce_clinic/actions/clinic_round_report.xml b/netforce_clinic/actions/clinic_round_report.xml
deleted file mode 100644
index 1b6b265..0000000
--- a/netforce_clinic/actions/clinic_round_report.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<action>
-    <field name="type">report_odt</field>
-    <field name="model">clinic.round.report</field>
-    <field name="method">get_data</field>
-    <field name="template">round</field>
-</action>
diff --git a/netforce_clinic/actions/clinic_schedule.xml b/netforce_clinic/actions/clinic_schedule.xml
deleted file mode 100644
index cea37f8..0000000
--- a/netforce_clinic/actions/clinic_schedule.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<action>
-    <field name="string">Schedule</field>
-    <field name="view_cls">multi_view</field>
-    <field name="model">clinic.schedule</field>
-    <field name="menu">clinic_menu</field>
-</action>
diff --git a/netforce_clinic/actions/report_clinic_round.xml b/netforce_clinic/actions/report_clinic_round.xml
deleted file mode 100644
index 23d58f7..0000000
--- a/netforce_clinic/actions/report_clinic_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<action>
-    <field name="type">report_odt</field>
-    <field name="model">clinic.round</field>
-    <field name="method">get_data</field>
-    <field name="template">round</field>
-</action>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 284e090..904d368 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -7,7 +7,6 @@
     <item string="Patients">
         <item string="Patients" action="clinic_patient"/>
         <item string="Dialyzers" action="clinic_dialyzer"/>
-        <!--<item string="Schedules" action="clinic_schedule"/>-->
         <divider/>
         <header string="OTHERS"/>
         <item string="Races" action="clinic_race"/>
diff --git a/netforce_clinic/layouts/clinic_schedule_form.xml b/netforce_clinic/layouts/clinic_schedule_form.xml
deleted file mode 100644
index 42c87c2..0000000
--- a/netforce_clinic/layouts/clinic_schedule_form.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<form model="clinic.schedule">
-    <field name="name"/>
-    <field name="code"/>
-</form>
diff --git a/netforce_clinic/layouts/clinic_schedule_list.xml b/netforce_clinic/layouts/clinic_schedule_list.xml
deleted file mode 100644
index 101cf88..0000000
--- a/netforce_clinic/layouts/clinic_schedule_list.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<list model="clinic.schedule">
-    <field name="name"/>
-    <field name="code"/>
-</list>
diff --git a/netforce_clinic/layouts/clinic_visit_form.xml b/netforce_clinic/layouts/clinic_visit_form.xml
index 077ace4..8094dc5 100644
--- a/netforce_clinic/layouts/clinic_visit_form.xml
+++ b/netforce_clinic/layouts/clinic_visit_form.xml
@@ -1,6 +1,7 @@
 <form model="clinic.visit" attrs='{"readonly":[["state","in",["confirmed"]]]}' show_company="1">
     <head>
         <field name="state"/>
+        <button string="Gen No." icon="check" type="primary" method="gen_no"/>
         <button string="Print" icon="print" action="report_visit_form"/>
         <button string="Options" dropdown="1">
             <item string="Copy" method="copy"/>
diff --git a/netforce_clinic/layouts/clinic_visit_list.xml b/netforce_clinic/layouts/clinic_visit_list.xml
index 868840b..ba83845 100644
--- a/netforce_clinic/layouts/clinic_visit_list.xml
+++ b/netforce_clinic/layouts/clinic_visit_list.xml
@@ -1,6 +1,8 @@
 <list model="clinic.visit">
     <search>
         <field name="number"/>
+        <field name="time_start"/>
+        <field name="time_stop"/>
         <field name="cycle_id"/>
         <field name="patient_id"/>
         <field name="doctor_id"/>
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index 3b028cf..af14153 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -3,7 +3,6 @@ from datetime import datetime, timedelta
 
 from netforce.model import Model, fields, get_model
 from netforce.access import get_active_company, get_active_user, set_active_user
-#from netforce.utils import get_data_path
 
 FMT_DATE="%Y-%m-%d %H:%M:%S"
 
@@ -13,6 +12,18 @@ class Visit(Model):
     _audit_log=True
     _name_field="number"
     _multi_company=True
+    
+    def _get_visit_date(self,ids,context):
+        res={}
+        for obj in self.browse(ids):
+            res[obj.id]=obj.time_start[0:10] 
+        return res
+
+    def _get_print_date(self,ids,context={}):
+        res={}
+        for obj in self.browse(ids):
+            res[obj.id]=datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        return res
 
     _fields={
         "number": fields.Char("Number",required=True,search=True),
@@ -28,9 +39,11 @@ class Visit(Model):
         "cycle_id": fields.Many2One("clinic.cycle","Cycle"),
         "state": fields.Selection([["draft","Draft"],["confirmed","Confirmed"],["cancelled","Cancelled"]],"Status",required=True),
         "comments": fields.One2Many("message","related_id","Comments"),
+        'visit_date': fields.Date('Visit Date',function="_get_visit_date"),
+        'print_date': fields.Date('Print Date',function="_get_print_date"),
     }
 
-    def _get_number( self,context={}):
+    def _get_number(self,context={}):
         while 1:
             seq_name='Clinic Visit'
             seq_id=get_model("sequence").find_sequence(name=seq_name)
@@ -247,5 +260,22 @@ class Visit(Model):
         obj.write({
             'state': 'draft',
         })
+    
+    def gen_no(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        if obj.number != '/':
+            return
+        number=self._get_number(context)
+        obj.write({
+            'number': number,
+        })
+        return {
+            'next': {
+                'name': 'clinic_visit',
+                'mode': 'form',
+                'active_id': obj.id,
+            },
+            'flash': 'Gen No OK',
+        }
 
 Visit.register()
diff --git a/netforce_clinic/reports/dialyzer_drop.xlsx b/netforce_clinic/reports/dialyzer_drop.xlsx
deleted file mode 100644
index 42fcc4e..0000000
Binary files a/netforce_clinic/reports/dialyzer_drop.xlsx and /dev/null differ
diff --git a/netforce_clinic/reports/round.odt b/netforce_clinic/reports/round.odt
deleted file mode 100644
index a17141b..0000000
Binary files a/netforce_clinic/reports/round.odt and /dev/null differ
diff --git a/netforce_clinic/reports/visit.odt b/netforce_clinic/reports/visit.odt
deleted file mode 100644
index 3cecd4d..0000000
Binary files a/netforce_clinic/reports/visit.odt and /dev/null differ
diff --git a/netforce_clinic/reports/visit_form.odt b/netforce_clinic/reports/visit_form.odt
index 7159b61..d678ee5 100644
Binary files a/netforce_clinic/reports/visit_form.odt and b/netforce_clinic/reports/visit_form.odt differ
