Merge lp:~camptocamp/ocb-addons/ocb-addons-fix-report_webkit-descriptor-20130211 into lp:ocb-addons

[Alexandre Fayolle - camptocamp]

[FIX] report_webkit - change description for new webkit lib path parameter

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (spellchecking)

[Stefan Rijnhart (Opener) (stefan-opener)]

In my original proposal I suggested to use the bug tracker as the glue between the official branches and the upstream, because I want to track that all code submitted to backports is also submitted to upstream. It is arguably overkill in this case to create a bug report, but is there an alternative procedure that we can standardize on for cases such as this one?

IMHO this is blocking for the merge, just to keep things organized.

review: Needs Information

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Well, I must say I agree with you Stefan : it's a bit overkill. But well, if this is the way to follow the "divergence" with Official branch, I think we should report a bug for this.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Here is the bug report, it was just missing in the MP.

https://bugs.launchpad.net/openobject-addons/+bug/1113418

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for the info!

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Oh, for even better tracking the bug should be set to also affect project ocb-addons, then target to series. I did it in this case because I already merged the fix just now.

=== modified file 'report_webkit/__openerp__.py'
--- report_webkit/__openerp__.py	2012-11-29 22:26:45 +0000
+++ report_webkit/__openerp__.py	2013-02-14 10:20:28 +0000
@@ -62,8 +62,9 @@
 PDF. Version 0.9.9 or later is necessary, and can be found at
 http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).
 
-After installing the library on the OpenERP Server machine, you need to set the
-path to the ``wkthtmltopdf`` executable file on each Company.
+After installing the library on the OpenERP Server machine, you need to set
+the path to the ``wkthtmltopdf`` executable file in a system parameter named ``webkit_path``
+in Settings -> Customization -> Low Level Object -> System Parameters
 
 If you are experiencing missing header/footer problems on Linux, be sure to
 install a 'static' version of the library. The default ``wkhtmltopdf`` on