[MERGE] report_webkit: handle more gracefull remove of 'lib_path' + fix test in l10n_ch

bzr revid: xal@openerp.com-20120417143047-h2091ueyte1jmem1

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'

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()