From a0c243899eee0770889c53993c85e20608afb397 Mon Sep 17 00:00:00 2001 From: Xavier ALT Date: Tue, 17 Apr 2012 09:34:34 +0200 Subject: [PATCH 1/2] [FIX] l10n_ch: fix yaml test still using deprecated lib_path on res.company bzr revid: xal@openerp.com-20120417073434-j07yjp69bljd8sop --- addons/l10n_ch/test/l10n_ch_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml index f120b14f33b..b02fa36c72c 100644 --- a/addons/l10n_ch/test/l10n_ch_report.yml +++ b/addons/l10n_ch/test/l10n_ch_report.yml @@ -57,4 +57,4 @@ !python {model: account.invoice}: | from tools.test_reports import try_report company = self.pool.get('res.users').browse(cr, uid, uid).company_id - company.lib_path and try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Webkit lib not set' + try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Unable to find Webkit' From f77cd768aebe9c8692a7ace396283399e5f66032 Mon Sep 17 00:00:00 2001 From: Xavier ALT Date: Tue, 17 Apr 2012 10:16:29 +0200 Subject: [PATCH 2/2] [FIX] report_webkit: restore 'lib_path' on model to gracefull handle code referencing it, but hide it in the view bzr revid: xal@openerp.com-20120417081629-2jeqm8myv34env7g --- addons/report_webkit/company.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py index 8be9b4005dd..a8dc71f220f 100644 --- a/addons/report_webkit/company.py +++ b/addons/report_webkit/company.py @@ -50,6 +50,9 @@ class ResCompany(osv.osv): 'html_id', 'Available html', ), + 'lib_path' : fields.char('Webkit Executable Path (Deprecated)', size=264, + help="This option is now deprecated in favor of autodetection of webkit location", + invisible=1), } ResCompany()