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

[Chirag Patel (OpenERP)]

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

[Naresh(OpenERP) (nch-openerp)]

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) on 2012-10-23

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

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2012-01-03 12:19:38 +0000
+++ hr_expense/hr_expense_view.xml	2012-10-23 09:34:22 +0000
@@ -29,6 +29,7 @@
             <field name="arch" type="xml">
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="employee_id"/>
+                    <field name="department_id"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>