From: Quentin (OpenERP) Date: Mon, 18 Jun 2012 15:09:38 +0000 (+0200) Subject: [FIX] analytic_contract_hr_expense: fixed bad merge made in previous commit X-Git-Tag: 7.0-server~893^2~145^2~17 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=9b539bb9dd2dc57775a1be91e8185ee01ead07a5;p=odoo%2Fodoo.git [FIX] analytic_contract_hr_expense: fixed bad merge made in previous commit bzr revid: qdp-launchpad@openerp.com-20120618150938-vu92lhd6jtm5feed --- diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml index b36178c..bf46941 100644 --- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml +++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml @@ -6,6 +6,7 @@ account.analytic.account form +