diff --git a/employee_orientation/README.rst b/employee_orientation/README.rst
index 05898b0fe..f5fac56b3 100644
--- a/employee_orientation/README.rst
+++ b/employee_orientation/README.rst
@@ -21,6 +21,7 @@ Credits
         Gion V15 @cybrosys odoo@cybrosys.com
 
 
+
 Contacts
 --------
 * Mail Contact : odoo@cybrosys.com
diff --git a/employee_orientation/__manifest__.py b/employee_orientation/__manifest__.py
index 4e81584a3..01c1d04a2 100644
--- a/employee_orientation/__manifest__.py
+++ b/employee_orientation/__manifest__.py
@@ -39,6 +39,7 @@
         'views/print_pack_certificates_template.xml',
         'views/report.xml',
         'views/employee_training.xml',
+        'wizard/orientation_complete.xml',
         'security/ir.model.access.csv',
     ],
     'images': ['static/description/banner.png'],
diff --git a/employee_orientation/models/employee_orientation.py b/employee_orientation/models/employee_orientation.py
index be6196bac..57fa20f82 100644
--- a/employee_orientation/models/employee_orientation.py
+++ b/employee_orientation/models/employee_orientation.py
@@ -28,21 +28,20 @@ class Orientation(models.Model):
     _inherit = 'mail.thread'
 
     name = fields.Char(string='Employee Orientation', readonly=True, default=lambda self: _('New'))
-    employee_name = fields.Many2one('hr.employee', string='Employee', size=32, required=True)
-    department = fields.Many2one('hr.department', string='Department', related='employee_name.department_id',
-                                 required=True)
+    employee_id = fields.Many2one('hr.employee', string='Employee', required=True)
+    department_id = fields.Many2one('hr.department', string='Department', related='employee_id.department_id',
+                                    required=True)
     date = fields.Datetime(string="Date")
-    # date = fields.Datetime.to_string(dateText)
-    responsible_user = fields.Many2one('res.users', string='Responsible User')
-    employee_company = fields.Many2one('res.company', string='Company', required=True,
-                                       default=lambda self: self.env.user.company_id)
-    parent_id = fields.Many2one('hr.employee', string='Manager', related='employee_name.parent_id')
-    job_id = fields.Many2one('hr.job', string='Job Title', related='employee_name.job_id',
-                             domain="[('department_id', '=', department)]")
+    responsible_user_id = fields.Many2one('res.users', string='Responsible User')
+    employee_company_id = fields.Many2one('res.company', string='Company', required=True,
+                                          default=lambda self: self.env.user.company_id)
+    parent_id = fields.Many2one('hr.employee', string='Manager', related='employee_id.parent_id')
+    job_id = fields.Many2one('hr.job', string='Job Title', related='employee_id.job_id',
+                             domain="[('department_id', '=', department_id)]")
     orientation_id = fields.Many2one('orientation.checklist', string='Orientation Checklist',
-                                     domain="[('checklist_department','=', department)]", required=True)
-    note_id = fields.Text('Description')
-    orientation_request = fields.One2many('orientation.request', 'request_orientation', string='Orientation Request')
+                                     domain="[('checklist_department_id','=', department_id)]", required=True)
+    note = fields.Text('Description')
+    orientation_request_ids = fields.One2many('orientation.request', 'request_orientation_id', string='Orientation Request')
     state = fields.Selection([
         ('draft', 'Draft'),
         ('confirm', 'Confirmed'),
@@ -52,23 +51,23 @@ class Orientation(models.Model):
 
     def confirm_orientation(self):
         self.write({'state': 'confirm'})
-        for values in self.orientation_id.checklist_line_id:
+        for values in self.orientation_id.checklist_line_ids:
             self.env['orientation.request'].create({
                 'request_name': values.line_name,
-                'request_orientation': self.id,
-                'partner_id': values.responsible_user.id,
+                'request_orientation_id': self.id,
+                'partner_id': values.responsible_user_id.id,
                 'request_date': self.date,
-                'employee_id': self.employee_name.id,
+                'employee_id': self.employee_id.id,
             })
 
     def cancel_orientation(self):
-        for request in self.orientation_request:
+        for request in self.orientation_request_ids:
             request.state = 'cancel'
         self.write({'state': 'cancel'})
 
     def complete_orientation(self):
         force_complete = False
-        for request in self.orientation_request:
+        for request in self.orientation_request_ids:
             if request.state == 'new':
                 force_complete = True
         if force_complete:
diff --git a/employee_orientation/models/employee_training.py b/employee_orientation/models/employee_training.py
index 34105b699..6a423ee59 100644
--- a/employee_orientation/models/employee_training.py
+++ b/employee_orientation/models/employee_training.py
@@ -38,9 +38,9 @@ class EmployeeTraining(models.Model):
     _inherit = 'mail.thread'
 
     program_name = fields.Char(string='Training Program', required=True)
-    program_department = fields.Many2one('hr.department', string='Department', required=True)
-    program_convener = fields.Many2one('res.users', string='Responsible User', size=32, required=True)
-    training_id = fields.One2many('hr.employee', string='Employee Details', compute="employee_details")
+    program_department_id = fields.Many2one('hr.department', string='Department', required=True)
+    program_convener_id = fields.Many2one('res.users', string='Responsible User', size=32, required=True)
+    training_ids = fields.One2many('hr.employee', string='Employee Details', compute="employee_details")
     note_id = fields.Text('Description')
     date_from = fields.Datetime(string="Date From")
     date_to = fields.Datetime(string="Date To")
@@ -56,10 +56,10 @@ class EmployeeTraining(models.Model):
         ('print', 'Print'),
     ], string='Status', readonly=True, copy=False, index=True, track_visibility='onchange', default='new')
 
-    @api.onchange('program_department')
+    @api.depends('program_department_id')
     def employee_details(self):
-        datas = self.env['hr.employee'].search([('department_id', '=', self.program_department.id)])
-        self.training_id = datas
+        datas = self.env['hr.employee'].search([('department_id', '=', self.program_department_id.id)])
+        self.training_ids = datas
 
     def print_event(self):
         self.ensure_one()
@@ -70,14 +70,14 @@ class EmployeeTraining(models.Model):
         hours = difference.hours
         minutes = difference.minutes
         data = {
-            'dept_id': self.program_department.id,
+            'dept_id': self.program_department_id.id,
             'program_name': self.program_name,
             'company_name': self.company_id.name,
             'date_to': started_date,
             'duration': duration,
             'hours': hours,
             'minutes': minutes,
-            'program_convener': self.program_convener.name,
+            'program_convener': self.program_convener_id.name,
 
         }
         return self.env.ref('employee_orientation.print_pack_certificates').report_action(self, data=data)
diff --git a/employee_orientation/models/orientation_checklist.py b/employee_orientation/models/orientation_checklist.py
index cc7ba4be0..0fe0ea7ef 100644
--- a/employee_orientation/models/orientation_checklist.py
+++ b/employee_orientation/models/orientation_checklist.py
@@ -30,10 +30,10 @@ class OrientationChecklist(models.Model):
     _inherit = 'mail.thread'
 
     checklist_name = fields.Char(string='Name', required=True)
-    checklist_department = fields.Many2one('hr.department', string='Department', required=True)
+    checklist_department_id = fields.Many2one('hr.department', string='Department', required=True)
     active = fields.Boolean(string='Active', default=True,
                             help="Set active to false to hide the Orientation Checklist without removing it.")
-    checklist_line_id = fields.Many2many('checklist.line', 'checklist_line_rel', String="Checklist")
+    checklist_line_ids = fields.Many2many('checklist.line', 'checklist_line_rel', String="Checklist")
 
 
 
diff --git a/employee_orientation/models/orientation_checklist_line.py b/employee_orientation/models/orientation_checklist_line.py
index 8ac5de189..e61319ce9 100644
--- a/employee_orientation/models/orientation_checklist_line.py
+++ b/employee_orientation/models/orientation_checklist_line.py
@@ -28,4 +28,4 @@ class ChecklistLine(models.Model):
     _rec_name = 'line_name'
 
     line_name = fields.Char(string='Name', required=True)
-    responsible_user = fields.Many2one('res.users', string='Responsible User', required=True)
+    responsible_user_id = fields.Many2one('res.users', string='Responsible User', required=True)
diff --git a/employee_orientation/models/orientation_checklist_request.py b/employee_orientation/models/orientation_checklist_request.py
index bdcb3b9d6..ea706f5e9 100644
--- a/employee_orientation/models/orientation_checklist_request.py
+++ b/employee_orientation/models/orientation_checklist_request.py
@@ -31,15 +31,15 @@ class OrientationChecklistRequest(models.Model):
     _inherit = 'mail.thread'
 
     request_name = fields.Char(string='Name')
-    request_orientation = fields.Many2one('employee.orientation', string='Employee Orientation')
-    employee_company = fields.Many2one('res.company', string='Company', required=True,
-                                       default=lambda self: self.env.user.company_id)
+    request_orientation_id = fields.Many2one('employee.orientation', string='Employee Orientation')
+    employee_company_id = fields.Many2one('res.company', string='Company', required=True,
+                                          default=lambda self: self.env.user.company_id)
     partner_id = fields.Many2one('res.users', string='Responsible User')
     request_date = fields.Date(string="Date")
     employee_id = fields.Many2one('hr.employee', string='Employee')
     request_expected_date = fields.Date(string="Expected Date")
     attachment_id_1 = fields.Many2many('ir.attachment', 'orientation_rel_1', string="Attachment")
-    note_id = fields.Text('Description')
+    note = fields.Text('Description')
     user_id = fields.Many2one('res.users', string='users', default=lambda self: self.env.user)
     company_id = fields.Many2one('res.company', string='Company', required=True,
                                  default=lambda self: self.env.user.company_id)
@@ -54,6 +54,7 @@ class OrientationChecklistRequest(models.Model):
         ir_model_data = self.env['ir.model.data']
         try:
             template_id = ir_model_data._xmlid_lookup('employee_orientation.orientation_request_mailer')[2]
+            print(template_id)
         except ValueError:
             template_id = False
         try:
@@ -61,6 +62,7 @@ class OrientationChecklistRequest(models.Model):
         except ValueError:
             compose_form_id = False
         ctx = dict(self.env.context or {})
+        print(template_id)
         ctx.update({
             'default_model': 'orientation.request',
             'default_res_id': self.ids[0],
diff --git a/employee_orientation/security/ir.model.access.csv b/employee_orientation/security/ir.model.access.csv
index 6f736f265..b94468166 100644
--- a/employee_orientation/security/ir.model.access.csv
+++ b/employee_orientation/security/ir.model.access.csv
@@ -6,3 +6,5 @@ access_manager_employee_orientation_request,orientation.checklist,model_orientat
 access_user_employee_training,employee.training,model_employee_training,hr.group_hr_user,1,1,1,1
 access_manager_employee_training,employee.training,model_employee_training,base.group_user,1,1,0,0
 access_manager_orientation_request,orientation.request,model_orientation_request,base.group_user,1,1,0,0
+access_orientation_complete,orientation.complete,model_orientation_force_complete,hr.group_hr_user,1,1,1,1
+
diff --git a/employee_orientation/views/employee_orientation.xml b/employee_orientation/views/employee_orientation.xml
index 3454fe54c..1844246a9 100644
--- a/employee_orientation/views/employee_orientation.xml
+++ b/employee_orientation/views/employee_orientation.xml
@@ -6,9 +6,9 @@
             <field name="model">employee.orientation</field>
             <field name="arch" type="xml">
                 <tree string="Employee Orientation">
-                    <field name="employee_name" />
-                    <field name="department" />
-                    <field name="responsible_user"/>
+                    <field name="employee_id" />
+                    <field name="department_id" />
+                    <field name="responsible_user_id"/>
                     <field name="orientation_id"/>
                     <field name="state"/>
                 </tree>
@@ -33,18 +33,18 @@
                             </h1>
                         </div>
                         <group colspan="1" col="4" name="main">
-                            <field name="employee_name" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
-                            <field name="department"/>
+                            <field name="employee_id" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
+                            <field name="department_id"/>
                             <field name="date" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
                             <field name="job_id" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
-                            <field name="responsible_user" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
+                            <field name="responsible_user_id" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
                             <field name="parent_id"/>
-                            <field name="employee_company" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
+                            <field name="employee_company_id" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
                             <field name="orientation_id" attrs="{'readonly':[('state','in',('confirm','complete'))]}"/>
                         </group>
                         <notebook colspan="4">
                             <page name="checklist_lines" string="Orientation Checklists Lines" attrs="{'invisible': [('state', '=', 'draft')]}">
-                                <field name="orientation_request" attrs="{'readonly':[('state','=','complete')]}">
+                                <field name="orientation_request_ids" attrs="{'readonly':[('state','=','complete')]}">
                                     <tree string="lines" editable="bottom" create="true">
                                         <field name="request_name"/>
                                         <field name="partner_id"/>
@@ -54,8 +54,8 @@
                                     <form>
                                         <group colspan="1" col="4" name="main">
                                             <field name="request_name" />
-                                            <field name="request_orientation"/>
-                                            <field name="employee_company" readonly="1"/>
+                                            <field name="request_orientation_id"/>
+                                            <field name="employee_company_id" readonly="1"/>
                                             <field name="partner_id"/>
                                             <field name="request_date" readonly="1"/>
                                             <field name="request_expected_date"/>
@@ -66,7 +66,7 @@
                             </page>
                             <page name="note_book"
                                 string="Notes">
-                                <field name="note_id" colspan="4" nolabel="1" />
+                                <field name="note" colspan="4" nolabel="1" />
                             </page>
                         </notebook>
                     </sheet>
@@ -82,13 +82,9 @@
             <field name="model">employee.orientation</field>
             <field name="arch" type="xml">
                 <search string="Employee Orientation">
-                    <field name="employee_name"/>
-                    <field name="department"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
                     <newline />
-<!--                    <group expand="0" string="Group By...">-->
-<!--                        <filter string="department" domain="[]"-->
-<!--                            context="{'group_by':'department'}" />-->
-<!--                    </group>-->
                 </search>
             </field>
         </record>
diff --git a/employee_orientation/views/employee_training.xml b/employee_orientation/views/employee_training.xml
index a91685810..774ef5bea 100644
--- a/employee_orientation/views/employee_training.xml
+++ b/employee_orientation/views/employee_training.xml
@@ -7,8 +7,8 @@
             <field name="arch" type="xml">
                 <tree string="Employee Training Program">
                     <field name="program_name"/>
-                    <field name="program_department"/>
-                    <field name="program_convener" domain="[('department_id.name', '=', 'program_department.name')]"/>
+                    <field name="program_department_id"/>
+                    <field name="program_convener_id" domain="[('department_id.name', '=', 'program_department.name')]"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -29,21 +29,20 @@
                     <sheet>
                         <group colspan="1" col="4" name="main">
                             <field name="program_name" />
-                            <field name="program_department"/>
+                            <field name="program_department_id"/>
                             <label for="date_from" string="Time Period"/>
                             <div><field name="date_from" class="oe_inline"/> to <field name="date_to" class="oe_inline"/></div>
-                            <field name="program_convener"/>
+                            <field name="program_convener_id"/>
                         </group>
                         <notebook colspan="4">
                             <page name="checklist_lines" string="Employee Details">
-                                <field name="training_id">
+                                <field name="training_ids">
                                     <tree editable="true">
                                         <field name="name"/>
                                         <field name="job_id"/>
                                         <field name="parent_id"/>
                                         <field name="certificates" />
                                     </tree>
-<!--                                    <field name="product_updatable" invisible="1"/>-->
                                 </field>
                             </page>
                             <page name="note_book"
diff --git a/employee_orientation/views/orientation_checklist.xml b/employee_orientation/views/orientation_checklist.xml
index ff8aa628b..9170480a2 100644
--- a/employee_orientation/views/orientation_checklist.xml
+++ b/employee_orientation/views/orientation_checklist.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="Orientation Checklists">
                     <field name="checklist_name" />
-                    <field name="checklist_department" />
+                    <field name="checklist_department_id" />
                 </tree>
             </field>
         </record>
@@ -22,15 +22,15 @@
                     <sheet>
                         <group colspan="1" col="4" name="main">
                             <field name="checklist_name" />
-                            <field name="checklist_department"/>
+                            <field name="checklist_department_id"/>
                             <field name="active"/>
                         </group>
                         <notebook colspan="4">
                             <page name="checklist_line" string="Checklist Lines">
-                                <field name="checklist_line_id" string="Checklist Line">
+                                <field name="checklist_line_ids" >
                                     <tree string="Checklist Lines" editable="bottom">
                                         <field name="line_name"/>
-                                        <field name="responsible_user"/>
+                                        <field name="responsible_user_id"/>
                                     </tree>
                                 </field>
                             </page>
@@ -50,12 +50,8 @@
             <field name="arch" type="xml">
                 <search string="Orientation Checklists">
                     <field name="checklist_name"/>
-                    <field name="checklist_department"/>
+                    <field name="checklist_department_id"/>
                     <newline />
-<!--                    <group expand="0" string="Group By">-->
-<!--                        <filter string="department" domain="[]"-->
-<!--                            context="{'group_by':'checklist_department'}" />-->
-<!--                    </group>-->
                 </search>
             </field>
         </record>
diff --git a/employee_orientation/views/orientation_checklist_line.xml b/employee_orientation/views/orientation_checklist_line.xml
index 754fd25c8..4aaa78e70 100644
--- a/employee_orientation/views/orientation_checklist_line.xml
+++ b/employee_orientation/views/orientation_checklist_line.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="Orientation Checklists Lines">
                     <field name="line_name" />
-                    <field name="responsible_user" />
+                    <field name="responsible_user_id" />
                 </tree>
             </field>
         </record>
@@ -21,7 +21,7 @@
                     <sheet>
                         <group colspan="1" col="4" name="main">
                             <field name="line_name" />
-                            <field name="responsible_user"/>
+                            <field name="responsible_user_id"/>
                         </group>
                     </sheet>
                 </form>
@@ -34,12 +34,8 @@
             <field name="arch" type="xml">
                 <search string="Orientation Checklists Lines">
                     <field name="line_name" />
-                    <field name="responsible_user" />
+                    <field name="responsible_user_id" />
                     <newline />
-<!--                    <group expand="0" string="Group By...">-->
-<!--                        <filter string="ResponsibleUser" domain="[]"-->
-<!--                            context="{'group_by':'responsible_user'}" />-->
-<!--                    </group>-->
                 </search>
             </field>
         </record>
diff --git a/employee_orientation/views/orientation_checklists_request.xml b/employee_orientation/views/orientation_checklists_request.xml
index 75b3af155..63545526e 100644
--- a/employee_orientation/views/orientation_checklists_request.xml
+++ b/employee_orientation/views/orientation_checklists_request.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <tree string="Employee Orientation" create="0">
                     <field name="request_name" />
-                    <field name="request_orientation" />
+                    <field name="request_orientation_id" />
                     <field name="partner_id" />
                     <field name="state"/>
                 </tree>
@@ -27,19 +27,19 @@
                     <sheet>
                         <group colspan="1" col="4" name="main">
                             <field name="request_name" readonly="1"/>
-                            <field name="request_orientation" readonly="1"/>
+                            <field name="request_orientation_id" readonly="1"/>
                             <field name="employee_id" readonly="1"/>
                             <field name="partner_id" readonly="1"/>
                             <field name="request_date" readonly="1"/>
                             <field name="request_expected_date" attrs="{'readonly':[('state','=','complete')]}"/>
-                            <field name="employee_company" readonly="1"/>
+                            <field name="employee_company_id" readonly="1"/>
                         </group>
                         <notebook>
                             <page name="orientation_line_attachments" string="Documents">
                                 <field name="attachment_id_1" widget="many2many_binary" attrs="{'readonly':[('state','=','complete')]}" />
                             </page>
                             <page name="note_book" string="Notes">
-                                <field name="note_id" nolabel="1"/>
+                                <field name="note" nolabel="1"/>
                             </page>
                         </notebook>
                     </sheet>
@@ -57,10 +57,6 @@
                 <search string="Employee Orientation">
                     <field name="request_name"/>
                     <newline />
-<!--                    <group expand="0" string="Group By...">-->
-<!--                        <filter string="Request" domain="[]"-->
-<!--                            context="{'group_by':'request_name'}" />-->
-<!--                    </group>-->
                 </search>
             </field>
         </record>
diff --git a/employee_orientation/views/orientation_request_mail_template.xml b/employee_orientation/views/orientation_request_mail_template.xml
index bb1e5da3d..bcb9645d4 100644
--- a/employee_orientation/views/orientation_request_mail_template.xml
+++ b/employee_orientation/views/orientation_request_mail_template.xml
@@ -3,8 +3,8 @@
     <data noupdate="1">
         <record id="orientation_request_mailer" model="mail.template">
             <field name="name">Employee Orientation Request</field>
-            <field name="email_from">{{(object.user_id.email or object.company_id.email)}}</field>
-            <field name="email_to">{{(object.partner_id.email)}}</field>
+            <field name="email_from">{{(object.user_id.login or object.company_id.email)}}</field>
+            <field name="email_to">{{(object.partner_id.work_email)}}</field>
             <field name="subject">Employee Orientation Request</field>
             <field name="model_id" ref="employee_orientation.model_orientation_request"/>
             <field name="auto_delete" eval="True"/>
@@ -71,20 +71,21 @@
         <record id="orientation_training_mailer" model="mail.template">
             <field name="name">Employee Training program</field>
             <field name="email_from">{{(object.user_id.email or object.company_id.email)}}</field>
-            <field name="email_to">{{(object.program_convener.email)}}</field>
+            <field name="email_to">{{(object.program_convener_id.login)}}</field>
             <field name="subject">Employee Training Request</field>
             <field name="model_id" ref="employee_orientation.model_employee_training"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html" type="html">
                 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
                     <p>
-                        Hello <t t-out="object.program_convener.name"/>,
+                        Hello
+                        <t t-out="object.program_convener_id.name"/>,
                     </p>
                     <p>
                         You are requested to conduct
                         <t t-out="object.program_name"/>
                         Training program for
-                        <t t-out="object.program_department.name"/>
+                        <t t-out="object.program_department_id.name"/>
                         department
                         <t t-if=" object.date_from and object.date_to">
                             from
diff --git a/employee_orientation/wizard/orientation_complete.py b/employee_orientation/wizard/orientation_complete.py
index 5c4fff6ae..d6f60cc3a 100644
--- a/employee_orientation/wizard/orientation_complete.py
+++ b/employee_orientation/wizard/orientation_complete.py
@@ -34,7 +34,7 @@ class OrientationForceComplete(models.TransientModel):
     def pending_lines(self):
         pending = []
 
-        for data in self.orientation_id.orientation_request:
+        for data in self.orientation_id.orientation_request_ids:
             if data.state == 'new':
                 pending.append(data.id)
         self.update({'orientation_lines': pending})