From 0d2a3d8dfbed624974a2da90ba6e6ebe211ec6a1 Mon Sep 17 00:00:00 2001
From: Sreejith P <sreejith@cybrosys.in>
Date: Tue, 22 May 2018 14:06:24 +0530
Subject: [PATCH] [UDT] Updated ref

---
 hr_employee_updation/models/hr_employee.py       |  4 ++++
 hr_reward_warning/models/hr_employee.py          |  6 ++----
 hr_reward_warning/models/hr_warning.py           |  4 +---
 hr_reward_warning/views/hr_announcement_view.xml | 10 ++--------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/hr_employee_updation/models/hr_employee.py b/hr_employee_updation/models/hr_employee.py
index 03805fe80..3bfb66702 100644
--- a/hr_employee_updation/models/hr_employee.py
+++ b/hr_employee_updation/models/hr_employee.py
@@ -44,6 +44,10 @@ class HrEmployeeFamilyInfo(models.Model):
     _description = 'HR Employee Family'
 
     member_name = fields.Char(string='Name', related='employee_ref.name', store=True)
+    employee_ref = fields.Many2one(string="Is Employee",
+                                   help='If family member currently is an employee of same company, '
+                                        'then please tick this field',
+                                   comodel_name='hr.employee')
     employee_id = fields.Many2one(string="Employee", help='Select corresponding Employee', comodel_name='hr.employee',
                                   invisible=1)
     relation = fields.Selection([('father', 'Father'),
diff --git a/hr_reward_warning/models/hr_employee.py b/hr_reward_warning/models/hr_employee.py
index 44730e53c..1574a2916 100644
--- a/hr_reward_warning/models/hr_employee.py
+++ b/hr_reward_warning/models/hr_employee.py
@@ -29,15 +29,13 @@ class HrAnnouncements(models.Model):
     @api.multi
     def _announcement_count(self):
         for obj in self:
-            announcement_ids = self.env['hr.announcement'].sudo().search([('is_announcement', '=', True),
-                                                                          ('state', 'in', ('approved', 'done'))])
+            announcement_ids = self.env['hr.announcement'].sudo().search([('state', 'in', ('approved', 'done'))])
             obj.announcement_count = len(announcement_ids)
 
     @api.multi
     def announcement_view(self):
         for obj in self:
-            ann_obj = self.env['hr.announcement'].sudo().search([('is_announcement', '=', True),
-                                                                 ('state', 'in', ('approved', 'done'))])
+            ann_obj = self.env['hr.announcement'].sudo().search([('state', 'in', ('approved', 'done'))])
             ann_ids = []
             for each in ann_obj:
                 ann_ids.append(each.id)
diff --git a/hr_reward_warning/models/hr_warning.py b/hr_reward_warning/models/hr_warning.py
index e744a64ac..5b377fd6f 100644
--- a/hr_reward_warning/models/hr_warning.py
+++ b/hr_reward_warning/models/hr_warning.py
@@ -41,7 +41,6 @@ class HrAnnouncementTable(models.Model):
                                      string="Attachment", help='You can attach the copy of your Letter')
     company_id = fields.Many2one('res.company', string='Company',
                                  default=lambda self: self.env.user.company_id, readonly=True,)
-    is_announcement = fields.Boolean(string='Is general Announcement?')
     announcement = fields.Html(string='Letter', states={'draft': [('readonly', False)]}, readonly=True)
 
     @api.multi
@@ -62,6 +61,5 @@ class HrAnnouncementTable(models.Model):
 
     @api.model
     def create(self, vals):
-        if vals.get('is_announcement'):
-            vals['name'] = self.env['ir.sequence'].next_by_code('hr.announcement')
+        vals['name'] = self.env['ir.sequence'].next_by_code('hr.announcement')
         return super(HrAnnouncementTable, self).create(vals)
diff --git a/hr_reward_warning/views/hr_announcement_view.xml b/hr_reward_warning/views/hr_announcement_view.xml
index cce5e3a6d..a3b1e2416 100644
--- a/hr_reward_warning/views/hr_announcement_view.xml
+++ b/hr_reward_warning/views/hr_announcement_view.xml
@@ -22,15 +22,10 @@
                         <button  string="Refuse" class="btn-primary" groups="hr.group_hr_manager" type="object"
                                 name="reject" states="to_approve"/>
                         <button string="Set to Done" type="object" name="set_to_done" groups="hr.group_hr_user"
-                                attrs="{'invisible': ['|',('state','not in',('approved', 'done')),
-                                                          ('is_announcement','=',False)]}"/>
+                                states="approved"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,to_approve,approved,done"/>
                     </header>
                     <sheet>
-                        <label for="is_announcement"/>
-                        <div>
-                            <field name="is_announcement"/>
-                        </div>
                         <h1>
                             <label for="name"/>
                             <div>
@@ -84,12 +79,11 @@
             <field name="arch" type="xml">
                 <search string="Announcements">
                     <field name="name"/>
-                    <field name="is_announcement"/>
                     <field name="announcement_reason"/>
                     <field name="state"/>
                     <separator/>
                     <filter name="approved_rewards" string="Approved Letters" domain="[('state', '=', 'approved')]"/>
-                    <filter name="general_announcements" string="General Announcements" domain="[('is_announcement', '=',True)]"/>
+                    <filter name="general_announcements" string="General Announcements" domain="[]"/>
                     <group expand="0" string="Group By">
                         <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
                     </group>