Merge lp:~openerp-dev/openobject-addons/6.1-opw-573807-msh into lp:openobject-addons/6.1

Proposed by Mohammed Shekha(Open ERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6769
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-573807-msh
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
hr_timesheet/wizard/hr_timesheet_sign_in_out.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-573807-msh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+103664@code.launchpad.net

Description of the change

Hello,

Fixed the issue of sign_in_out_wizard action which returns tree by default as a first view even though we have not defined tree on hr.sign.in/out.project object.

Demo :- Go to Human Resources -> Attendance -> Sign in / out by project -> start working here you will see, you will get a tree view.

Expected :- Form view for Sign in or Sign out.

Thanks.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6769. By Mohammed Shekha(Open ERP)

[FIX]Fixed the issue of sign_in_out_wizard action which returns tree by default as a first view even though we have not defined tree on hr.sign.in/out.project object.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out.py'
2--- hr_timesheet/wizard/hr_timesheet_sign_in_out.py 2011-12-21 10:52:14 +0000
3+++ hr_timesheet/wizard/hr_timesheet_sign_in_out.py 2012-04-26 11:12:24 +0000
4@@ -147,7 +147,7 @@
5 'view_type': 'form',
6 'view_mode': 'tree,form',
7 'res_model': 'hr.sign.%s.project' % in_out,
8- 'views': [(False,'tree'), (resource_id,'form')],
9+ 'views': [(resource_id,'form')],
10 'type': 'ir.actions.act_window',
11 'target': 'new'
12 }