[FIX] analytic_contract_hr_expense: fixed bad merge made in previous commit
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 18 Jun 2012 15:09:38 +0000 (17:09 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 18 Jun 2012 15:09:38 +0000 (17:09 +0200)
commit9b539bb9dd2dc57775a1be91e8185ee01ead07a5
tree6dc0ef9d333acb7a99edb15a64080c9f12d87e01
parent0182e3b17b8d53d7d5cbefa33b29cb8590064f25
[FIX] analytic_contract_hr_expense: fixed bad merge made in previous commit

bzr revid: qdp-launchpad@openerp.com-20120618150938-vu92lhd6jtm5feed
addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml