odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] revert change in employee 

bzr revid: mat@openerp.com-20130307155358-z2js7sce3p1w0av3
This commit is contained in:
Martin Trigaux 2013-03-07 16:53:58 +01:00
parent 1b01215929
commit 4e9092aa48
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/gamification/plan.py
View File

@ -242,11 +242,11 @@ class gamification_goal_plan(osv.Model):
# goals closed but still opened at the last report date
closed_goals_to_report = []
for planline in plan.planline_ids:
closed_goals_to_report.extend( goal_obj.search(cr, uid, [
closed_goals_to_report.extend(goal_obj.search(cr, uid, [
('planline_id','=',planline.id),
('start_date', '>=', plan.last_report_date),
('end_date', '<=', plan.last_report_date)
]) )
]))
if len(closed_goals_to_report) > 0:
# some goals need a final report

12
addons/hr/hr_view.xml
View File

@ -31,15 +31,9 @@
<div class="oe_right oe_button_box" name="button_box">
<!-- Put here related buttons -->
</div>
<div class="oe_right" name="info_box">
<field name="message_follower_ids" widget="mail_followers"/>
</div>
<notebook>
<page string="Public Profile">
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/>
</div>
</page>
<page string="Public Information">
<group>
@ -91,6 +85,10 @@
</group>
</page>
</notebook>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/>
</div>
</sheet>
</form>
</field>