From a92cc45cc3c1058bc16946cce90e84d04c65c43f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 10:52:38 +0200
Subject: [PATCH] [IMP] order and domain

bzr revid: mat@openerp.com-20130424085238-k8q6uess92xl2q5u
---
 addons/gamification/goal.py                  | 2 +-
 addons/hr_gamification/gamification_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index 3c788abc22e..d836bcc82c1 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -222,7 +222,7 @@ class gamification_goal(osv.Model):
         'state': 'draft',
         'start_date': fields.date.today,
     }
-    _order = 'create_date, end_date desc, type_id, id'
+    _order = 'create_date desc, end_date desc, type_id, id'
 
     def update(self, cr, uid, ids, context=None):
         """Update the goals to recomputes values and change of states
diff --git a/addons/hr_gamification/gamification_view.xml b/addons/hr_gamification/gamification_view.xml
index fa43895e618..08064526460 100644
--- a/addons/hr_gamification/gamification_view.xml
+++ b/addons/hr_gamification/gamification_view.xml
@@ -11,7 +11,7 @@
                 <form string="Grant Badge To" version="7.0">
                     Who would you like to reward?
                     <group>
-                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" />
+                        <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False),('user_id', '!=', uid)]" />
                         <field name="badge_id" invisible="1"/>
                         <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding"/>
                     </group>