Merge lp:~openerp-dev/openobject-addons/6.1-opw-581147-cpa into lp:openobject-addons/6.1

Proposed by Chirag Patel (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 7038
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-581147-cpa
Merge into: lp:openobject-addons/6.1
Diff against target: 11 lines (+1/-0)
1 file modified
hr_expense/hr_expense_view.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-581147-cpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+130962@code.launchpad.net

Description of the change

Hello,

Fixed department_id not found in hr expenses tree view.

Demo: Human Resources > Expenses > Expenses
1) Click on Group by "Department".

Observed: TypeError: group_column is undefined.

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

7038. By Chirag Patel (OpenERP)

[FIX] Fixed department not found in hr expenses tree view.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_expense/hr_expense_view.xml'
2--- hr_expense/hr_expense_view.xml 2012-01-03 12:19:38 +0000
3+++ hr_expense/hr_expense_view.xml 2012-10-23 09:34:22 +0000
4@@ -29,6 +29,7 @@
5 <field name="arch" type="xml">
6 <tree string="Expenses" colors="blue:state=='draft'">
7 <field name="employee_id"/>
8+ <field name="department_id"/>
9 <field name="date"/>
10 <field name="user_id" invisible="1"/>
11 <field name="name"/>