From fc6ac83608e7b55f6206afe91377840788a5cd79 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Feb 2015 15:35:08 +0100
Subject: [PATCH 01/25] [FIX] mail: hide delete button when uploading
 attachment

This is not possible to interrupt the uploading of an attachment.
We therefore hide the 'delete' button during the upload
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1e52105c739..1ec8e0bf879 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -93,7 +93,7 @@
                         <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
+                    <div t-if="!attachment.upload" class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -105,7 +105,7 @@
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
-                    <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
+                    <div t-if="!attachment.upload" class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>

From 6c37747057506e99edffaabe6c904812eed41f5b Mon Sep 17 00:00:00 2001
From: Arthur Maniet <arthurmaniet@me.com>
Date: Fri, 20 Feb 2015 06:07:56 +0100
Subject: [PATCH 02/25] [FIX] account: don't create move lines that have
 neither an amount or a tax code Fixes
 51e9f90981d08d55c603b2fc21c8b9c8621a9a35

---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index fc0cf781947..29dfb139a64 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1374,7 +1374,7 @@ class account_move_line(osv.osv):
                     }
                     self.create(cr, uid, data, context)
                 #create the Tax movement
-                if not tax['amount']:
+                if not tax['amount'] and not tax[tax_code]:
                     continue
                 data = {
                     'move_id': vals['move_id'],

From 7f5bc3fdf0a5d40bcaec8f5170e04a8191a95499 Mon Sep 17 00:00:00 2001
From: Somesh Khare <skh@openerp.com>
Date: Tue, 2 Dec 2014 15:54:56 +0530
Subject: [PATCH 03/25] [Fix] hr_expense: correct amount for included tax with
 negative sign

Setting an expense with a tax included with a negative base code sign was
getting the wrong amount (tax line as a credit instead of debit). So leading to
a total for the accounting entry superior of the total of the expense (should
not happend as the tax is included).
Add test to verify this scenario.
Fixes #4260, opw 618531
---
 addons/hr_expense/hr_expense.py               |  4 +-
 addons/hr_expense/tests/__init__.py           |  5 ++
 .../hr_expense/tests/test_journal_entries.py  | 61 +++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 addons/hr_expense/tests/__init__.py
 create mode 100644 addons/hr_expense/tests/test_journal_entries.py

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index e14e79aaa32..e744ead5544 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -317,7 +317,7 @@ class hr_expense_expense(osv.osv):
                 is_price_include = tax_obj.read(cr,uid,tax['id'],['price_include'],context)['price_include']
                 if is_price_include:
                     ## We need to deduce the price for the tax
-                    res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['base_sign'] or 0.0)
+                    res[-1]['price'] = res[-1]['price'] - tax['amount']
                     # tax amount countains base amount without the tax
                     base_tax_amount = (base_tax_amount - tax['amount']) * tax['base_sign']
                 else:
@@ -328,7 +328,7 @@ class hr_expense_expense(osv.osv):
                              'name':tax['name'],
                              'price_unit': tax['price_unit'],
                              'quantity': 1,
-                             'price':  tax['amount'] * tax['base_sign'] or 0.0,
+                             'price': tax['amount'] or 0.0,
                              'account_id': tax['account_collected_id'] or mres['account_id'],
                              'tax_code_id': tax['tax_code_id'],
                              'tax_amount': tax['amount'] * tax['base_sign'],
diff --git a/addons/hr_expense/tests/__init__.py b/addons/hr_expense/tests/__init__.py
new file mode 100644
index 00000000000..8c94d56e555
--- /dev/null
+++ b/addons/hr_expense/tests/__init__.py
@@ -0,0 +1,5 @@
+from . import test_journal_entries
+
+fast_suite = [
+    test_journal_entries
+]
\ No newline at end of file
diff --git a/addons/hr_expense/tests/test_journal_entries.py b/addons/hr_expense/tests/test_journal_entries.py
new file mode 100644
index 00000000000..55251486607
--- /dev/null
+++ b/addons/hr_expense/tests/test_journal_entries.py
@@ -0,0 +1,61 @@
+from openerp.tests.common import TransactionCase
+from openerp import netsvc
+
+
+class TestCheckJournalEntry(TransactionCase):
+    """
+    Check journal entries when the expense product is having tax which is tax included. 
+    """
+
+    def setUp(self):
+        super(TestCheckJournalEntry, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.expense_obj = self.registry('hr.expense.expense')
+        self.exp_line_obj = self.registry('hr.expense.line')
+        self.product_obj = self.registry('product.product')
+        self.wf_service = netsvc.LocalService('workflow')
+        self.tax_obj = self.registry('account.tax')
+        self.code_obj = self.registry('account.tax.code')
+        _, self.product_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr_expense", "air_ticket")
+        _, self.employee_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr", "employee_mit")
+        self.base_code_id = self.code_obj.create(cr, uid, {'name': 'Expense Base Code'})
+        self.tax_id = self.tax_obj.create(cr, uid, {
+            'name': 'Expense 10%',
+            'amount': 0.10,
+            'type': 'percent',
+            'type_tax_use': 'purchase',
+            'price_include': True,
+            'base_code_id': self.base_code_id,
+            'base_sign': -1,
+        })
+        self.product_obj.write(cr, uid, self.product_id, {'supplier_taxes_id': [(6, 0, [self.tax_id])]})
+        self.expense_id = self.expense_obj.create(cr, uid, {
+            'name': 'Expense for Minh Tran',
+            'employee_id': self.employee_id,
+        })
+        self.exp_line_obj.create(cr, uid, {
+            'name': 'Car Travel Expenses',
+            'product_id': self.product_id,
+            'unit_amount': 700.00,
+            'expense_id': self.expense_id
+        })
+
+    def test_journal_entry(self):
+        cr, uid = self.cr, self.uid
+        #Submit to Manager
+        self.wf_service.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'confirm', cr)
+        #Approve
+        self.wf_service.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'validate', cr)
+        #Create Expense Entries
+        self.wf_service.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'done', cr)
+        self.expense = self.expense_obj.browse(cr, uid, self.expense_id)
+        self.assertEquals(self.expense.state, 'done', 'Expense is not in Waiting Payment state')
+        self.assertTrue(self.expense.account_move_id.id, 'Expense Journal Entry is not created')
+        for line in self.expense.account_move_id.line_id:
+            if line.credit:
+                self.assertEquals(line.credit, 700.00, 'Expense Payable Amount is not matched for journal item')
+            else:
+                if line.tax_code_id:
+                    self.assertEquals(line.debit, 636.36, 'Tax Amount is not matched for journal item')
+                else:
+                    self.assertEquals(line.debit, 63.64, 'Tax Base Amount is not matched for journal item')

From f24df6a93c14c59d7393368370e969b8ff30ddcc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Fri, 20 Feb 2015 10:26:13 +0100
Subject: [PATCH 04/25] [FIX] ws doc: fix DOM order for copy/paste usability

The toggle button for the setup code in code examples of the webservice
page was mistakenly inserted between the setup code and the "actual"
code in the DOM. Trying to select the whole snippet (including setup)
would thus also select the text of the button and copy it to the
clipboard, breaking the copied code and confusing users.

Fix DOM order so selecting setup and actual code does not include the
text of the toggle button.
---
 doc/_themes/odoodoc/static/app.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/_themes/odoodoc/static/app.js b/doc/_themes/odoodoc/static/app.js
index 208a29dcf42..64a77c15c40 100644
--- a/doc/_themes/odoodoc/static/app.js
+++ b/doc/_themes/odoodoc/static/app.js
@@ -66,22 +66,25 @@ $(function () {
             .prependTo('.switchable:not(.setup) .highlight');
         $(document).on('click', '.btn-show-setup', function (e) {
             var $target = $(e.target);
-            var target = $target.closest('.switchable:not(.setup)').get(0);
+            var switchable = $target.closest('.switchable:not(.setup)').get(0);
             // not in a switchable (???)
-            if (!target) { return; }
-            var lang = getHighlightLanguage(target);
+            if (!switchable) { return; }
+
+            var lang = getHighlightLanguage(switchable);
             if (!lang) {
                 // switchable without highlight (e.g. language-specific notes),
                 // don't munge
                 return;
             }
 
-            var $setup_code = $target.prev();
-            if ($setup_code.length) {
-                // remove existing setup code
-                $setup_code.remove();
+            var $following_siblings = $target.nextAll();
+            if ($following_siblings.length > 1) {
+                // remove all but the very last following sibling (which
+                // should be the non-setup <pre>)
+                $following_siblings.slice(0, -1).remove();
             } else {
-                $('.setupcode.highlight-' + lang + ' pre').clone().insertBefore($target);
+                // otherwise insert setupcode
+                $('.setupcode.highlight-' + lang + ' pre').clone().insertAfter($target);
             }
         });
     })(); }

From 0892a088fc7fad792f9912ac53f74b79a71ab8fb Mon Sep 17 00:00:00 2001
From: Vicente Jimenez Aguilar <googuy@gmail.com>
Date: Fri, 20 Feb 2015 01:10:58 +0100
Subject: [PATCH 05/25] [FIX] report_webkit: multiple misspellings of
 wkhtmltopdf

closes #5392
---
 addons/report_webkit/__openerp__.py  |  4 ++--
 addons/report_webkit/i18n/es_MX.po   |  4 ++--
 addons/report_webkit/i18n/es_VE.po   |  4 ++--
 doc/cla/individual/vice.md           | 11 +++++++++++
 openerp/addons/base/i18n/ab.po       |  4 ++--
 openerp/addons/base/i18n/af.po       |  4 ++--
 openerp/addons/base/i18n/am.po       |  4 ++--
 openerp/addons/base/i18n/ar.po       |  4 ++--
 openerp/addons/base/i18n/base.pot    |  4 ++--
 openerp/addons/base/i18n/bg.po       |  4 ++--
 openerp/addons/base/i18n/bn.po       |  4 ++--
 openerp/addons/base/i18n/bs.po       |  4 ++--
 openerp/addons/base/i18n/ca.po       |  4 ++--
 openerp/addons/base/i18n/cs.po       |  4 ++--
 openerp/addons/base/i18n/da.po       |  4 ++--
 openerp/addons/base/i18n/de.po       |  8 ++++----
 openerp/addons/base/i18n/el.po       |  8 ++++----
 openerp/addons/base/i18n/en_GB.po    |  4 ++--
 openerp/addons/base/i18n/es.po       |  8 ++++----
 openerp/addons/base/i18n/es_AR.po    |  4 ++--
 openerp/addons/base/i18n/es_BO.po    |  4 ++--
 openerp/addons/base/i18n/es_CL.po    |  4 ++--
 openerp/addons/base/i18n/es_CR.po    |  4 ++--
 openerp/addons/base/i18n/es_DO.po    |  4 ++--
 openerp/addons/base/i18n/es_EC.po    |  4 ++--
 openerp/addons/base/i18n/es_HN.po    |  4 ++--
 openerp/addons/base/i18n/es_MX.po    |  4 ++--
 openerp/addons/base/i18n/es_PA.po    |  4 ++--
 openerp/addons/base/i18n/es_PE.po    |  4 ++--
 openerp/addons/base/i18n/es_VE.po    |  4 ++--
 openerp/addons/base/i18n/et.po       |  4 ++--
 openerp/addons/base/i18n/eu.po       |  4 ++--
 openerp/addons/base/i18n/fa.po       |  4 ++--
 openerp/addons/base/i18n/fa_AF.po    |  4 ++--
 openerp/addons/base/i18n/fi.po       |  4 ++--
 openerp/addons/base/i18n/fr.po       |  4 ++--
 openerp/addons/base/i18n/fr_CA.po    |  4 ++--
 openerp/addons/base/i18n/gl.po       |  4 ++--
 openerp/addons/base/i18n/gu.po       |  4 ++--
 openerp/addons/base/i18n/he.po       |  4 ++--
 openerp/addons/base/i18n/hi.po       |  4 ++--
 openerp/addons/base/i18n/hr.po       |  4 ++--
 openerp/addons/base/i18n/hu.po       |  8 ++++----
 openerp/addons/base/i18n/hy.po       |  4 ++--
 openerp/addons/base/i18n/id.po       |  4 ++--
 openerp/addons/base/i18n/is.po       |  4 ++--
 openerp/addons/base/i18n/it.po       |  4 ++--
 openerp/addons/base/i18n/ja.po       |  4 ++--
 openerp/addons/base/i18n/ka.po       |  4 ++--
 openerp/addons/base/i18n/kk.po       |  4 ++--
 openerp/addons/base/i18n/ko.po       |  4 ++--
 openerp/addons/base/i18n/lt.po       |  4 ++--
 openerp/addons/base/i18n/lv.po       |  4 ++--
 openerp/addons/base/i18n/mk.po       |  4 ++--
 openerp/addons/base/i18n/mn.po       |  4 ++--
 openerp/addons/base/i18n/nb.po       |  4 ++--
 openerp/addons/base/i18n/nl.po       |  4 ++--
 openerp/addons/base/i18n/nl_BE.po    |  4 ++--
 openerp/addons/base/i18n/pl.po       |  4 ++--
 openerp/addons/base/i18n/pt.po       |  4 ++--
 openerp/addons/base/i18n/pt_BR.po    |  4 ++--
 openerp/addons/base/i18n/ro.po       |  4 ++--
 openerp/addons/base/i18n/ru.po       |  4 ++--
 openerp/addons/base/i18n/sk.po       |  4 ++--
 openerp/addons/base/i18n/sl.po       |  4 ++--
 openerp/addons/base/i18n/sq.po       |  4 ++--
 openerp/addons/base/i18n/sr.po       |  4 ++--
 openerp/addons/base/i18n/sr@latin.po |  4 ++--
 openerp/addons/base/i18n/sv.po       |  4 ++--
 openerp/addons/base/i18n/ta.po       |  4 ++--
 openerp/addons/base/i18n/th.po       |  4 ++--
 openerp/addons/base/i18n/tlh.po      |  4 ++--
 openerp/addons/base/i18n/tr.po       |  4 ++--
 openerp/addons/base/i18n/uk.po       |  4 ++--
 openerp/addons/base/i18n/ur.po       |  4 ++--
 openerp/addons/base/i18n/vi.po       |  4 ++--
 openerp/addons/base/i18n/zh_CN.po    |  4 ++--
 openerp/addons/base/i18n/zh_HK.po    |  4 ++--
 openerp/addons/base/i18n/zh_TW.po    |  4 ++--
 79 files changed, 175 insertions(+), 164 deletions(-)
 create mode 100644 doc/cla/individual/vice.md

diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 96f3b0dd2ec..02cda6178db 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -58,12 +58,12 @@ For a sample report see also the webkit_report_sample module, and this video:
 
 Requirements and Installation:
 ------------------------------
-This module requires the ``wkthtmltopdf`` library to render HTML documents as
+This module requires the ``wkhtmltopdf`` library to render HTML documents as
 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 may need to set
-the path to the ``wkthtmltopdf`` executable file in a system parameter named
+the path to the ``wkhtmltopdf`` executable file in a system parameter named
 ``webkit_path`` in Settings -> Customization -> Parameters -> System Parameters
 
 If you are experiencing missing header/footer problems on Linux, be sure to
diff --git a/addons/report_webkit/i18n/es_MX.po b/addons/report_webkit/i18n/es_MX.po
index 8e0b1ac5a2a..af7d0c90935 100644
--- a/addons/report_webkit/i18n/es_MX.po
+++ b/addons/report_webkit/i18n/es_MX.po
@@ -259,7 +259,7 @@ msgid ""
 "\n"
 "After installing the wkhtmltopdf library on the OpenERP Server machine, you "
 "need to set the\n"
-"path to the wkthtmltopdf executable file on the Company.\n"
+"path to the wkhtmltopdf executable file on the Company.\n"
 "\n"
 "For a sample report see also the webkit_report_sample module, and this "
 "video:\n"
@@ -300,7 +300,7 @@ msgstr ""
 "\n"
 "Después de instalar la biblioteca wkhtmltopdf en el servidor de OpenERP, es "
 "necesario establecer la\n"
-"ruta de acceso al archivo ejecutable wkthtmltopdf en la compañía.\n"
+"ruta de acceso al archivo ejecutable wkhtmltopdf en la compañía.\n"
 "\n"
 "Para obtener un informe de ejemplo véase también el módulo "
 "webkit_report_sample, y este vídeo:\n"
diff --git a/addons/report_webkit/i18n/es_VE.po b/addons/report_webkit/i18n/es_VE.po
index 8e0b1ac5a2a..af7d0c90935 100644
--- a/addons/report_webkit/i18n/es_VE.po
+++ b/addons/report_webkit/i18n/es_VE.po
@@ -259,7 +259,7 @@ msgid ""
 "\n"
 "After installing the wkhtmltopdf library on the OpenERP Server machine, you "
 "need to set the\n"
-"path to the wkthtmltopdf executable file on the Company.\n"
+"path to the wkhtmltopdf executable file on the Company.\n"
 "\n"
 "For a sample report see also the webkit_report_sample module, and this "
 "video:\n"
@@ -300,7 +300,7 @@ msgstr ""
 "\n"
 "Después de instalar la biblioteca wkhtmltopdf en el servidor de OpenERP, es "
 "necesario establecer la\n"
-"ruta de acceso al archivo ejecutable wkthtmltopdf en la compañía.\n"
+"ruta de acceso al archivo ejecutable wkhtmltopdf en la compañía.\n"
 "\n"
 "Para obtener un informe de ejemplo véase también el módulo "
 "webkit_report_sample, y este vídeo:\n"
diff --git a/doc/cla/individual/vice.md b/doc/cla/individual/vice.md
new file mode 100644
index 00000000000..acd4d1515b8
--- /dev/null
+++ b/doc/cla/individual/vice.md
@@ -0,0 +1,11 @@
+Spain, 2015-02-20
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Vicente Jimenez Aguilar googuy@gmail.com https://github.com/vice
diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index b57ce53d024..2d3b210887f 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 8e6f68cc06e..9871f735027 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -3266,7 +3266,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3274,7 +3274,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 24648754039..0514fd41067 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -3295,7 +3295,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3303,7 +3303,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 47536650e0a..407940c6735 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -3270,7 +3270,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3278,7 +3278,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index 912523af19e..bd51b62d6c4 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -2743,12 +2743,12 @@ msgid "\n"
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents as\n"
+"This module requires the ``wkhtmltopdf`` library to render HTML documents as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).\n"
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter named\n"
+"the path to the ``wkhtmltopdf`` executable file in a system parameter named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System Parameters\n"
 "\n"
 "If you are experiencing missing header/footer problems on Linux, be sure to\n"
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 0eee2bc8f9f..e36d338945d 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -3314,7 +3314,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3322,7 +3322,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index f146dec44bd..3ddfd8fb594 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index b4f876b773a..d4ea928bb01 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -3316,7 +3316,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3324,7 +3324,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index f8e3207b1d0..fde195549fa 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -3286,7 +3286,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3294,7 +3294,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index d8d2a534f52..5383a9e1788 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -3659,7 +3659,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3667,7 +3667,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index d2b79fcb383..063379200a6 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -3270,7 +3270,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3278,7 +3278,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 36177d1f048..915aba768e1 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -5256,7 +5256,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -5264,7 +5264,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
@@ -5316,7 +5316,7 @@ msgstr ""
 "\n"
 "Voraussetzungen und Installation:\n"
 "----------------------------------------------\n"
-"Dieses Modul erfordert die ``wkthtmltopdf`` Bibliothek, um HTML-Dokumente "
+"Dieses Modul erfordert die ``wkhtmltopdf`` Bibliothek, um HTML-Dokumente "
 "in\n"
 "PDF umzuwandeln. Version 0.9.9 oder höher ist erforderlich und können Sie "
 "für Linux,\n"
@@ -5325,7 +5325,7 @@ msgstr ""
 "\n"
 "Nach der Installation der Bibliothek auf dem OpenERP Server-Rechner, müssen "
 "Sie den \n"
-"Pfad zur ausführbaren Datei ``wkthtmltopdf`` für jedes Unternehmen "
+"Pfad zur ausführbaren Datei ``wkhtmltopdf`` für jedes Unternehmen "
 "herstellen.\n"
 "\n"
 "Wenn Sie ein Problem mit fehlender Kopf- und Fußzeile bei Linux haben, "
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 7f44193c239..5544470e46e 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -5432,7 +5432,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -5440,7 +5440,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
@@ -5489,7 +5489,7 @@ msgstr ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -5497,7 +5497,7 @@ msgstr ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 356302d7d65..33c5f29536c 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -3742,7 +3742,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3750,7 +3750,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index c4547016d6c..e5dcbe37c89 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -5464,7 +5464,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -5472,7 +5472,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
@@ -5520,14 +5520,14 @@ msgstr ""
 "\n"
 "Requerimientos e instalación:\n"
 "------------------------------------\n"
-"Este módulo requiere la librería  ``wkthtmltopdf`` para renderizar "
+"Este módulo requiere la librería  ``wkhtmltopdf`` para renderizar "
 "documentos HTML como PDF. \n"
 " Version 0.9.9 o posterior. Se puede encontrar aquí: \n"
 "http://code.google.com/p/wkhtmltopdf/ para Linux, Mac OS X (i386) y Windows "
 "(32bits).\n"
 "\n"
 "Después de instalar la librería en el servidor, puede requerir aplicar el "
-"parche al fichero ejecutable ``wkthtmltopdf`` en un parámetro del sistema "
+"parche al fichero ejecutable ``wkhtmltopdf`` en un parámetro del sistema "
 "que se llama ``webkit_path`` \n"
 "``webkit_path`` en Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 387986bbccb..43161e8dbba 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -3841,7 +3841,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3849,7 +3849,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 45402ace7ec..733ddc50cc9 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 3d0f7dbc199..1407cddfacb 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -3266,7 +3266,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3274,7 +3274,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 4b57f32f7c7..81dc75be905 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -3381,7 +3381,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3389,7 +3389,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index 337b177d5dd..302751a5a77 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -3802,7 +3802,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3810,7 +3810,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 4806d6ce8e0..bab7cd7d2d0 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -3329,7 +3329,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3337,7 +3337,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_HN.po b/openerp/addons/base/i18n/es_HN.po
index bb8dbdc266d..c81a4d9b255 100644
--- a/openerp/addons/base/i18n/es_HN.po
+++ b/openerp/addons/base/i18n/es_HN.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index e731c99ddff..52b84f2be89 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -3269,7 +3269,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3277,7 +3277,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_PA.po b/openerp/addons/base/i18n/es_PA.po
index 5a06ce861ae..52341e5d100 100644
--- a/openerp/addons/base/i18n/es_PA.po
+++ b/openerp/addons/base/i18n/es_PA.po
@@ -3264,7 +3264,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3272,7 +3272,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index d0ec00d5b9f..506548a5ca0 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index f1ac947882c..932f6180a2b 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -3267,7 +3267,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3275,7 +3275,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index cece52bb0bf..b3d99562d9b 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -3267,7 +3267,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3275,7 +3275,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 2feabd62ce0..81c5308315c 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 9366cd2472c..dab302f1937 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 3c906f0869d..1fe65b2aa41 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 1e57a785ab1..8656de0c07b 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -3376,7 +3376,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3384,7 +3384,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 7519ce20f8b..6f3b792d686 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -4061,7 +4061,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -4069,7 +4069,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index cd3c5657c97..deb2c706899 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -3333,7 +3333,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3341,7 +3341,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 465e4e5eb70..a99d6ab44fa 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -3323,7 +3323,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3331,7 +3331,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 381d8f89899..c824d2f0a37 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 73f546b3444..82b1e2e7025 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -3315,7 +3315,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3323,7 +3323,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index 35d3c074ced..8f43ee2cb67 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -3266,7 +3266,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3274,7 +3274,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index cf0501f4c3a..7dc16e6755a 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -3297,7 +3297,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3305,7 +3305,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index bdb9d639750..be0dbe8faa1 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -5743,7 +5743,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -5751,7 +5751,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
@@ -5798,7 +5798,7 @@ msgstr ""
 "\n"
 "Követelmények és telepítés:\n"
 "------------------------------\n"
-"A modulhoz kelleni fog a ``wkthtmltopdf`` könyvtár a HTML dokumentumok PDF-"
+"A modulhoz kelleni fog a ``wkhtmltopdf`` könyvtár a HTML dokumentumok PDF-"
 "re\n"
 "alakításához. 0.9.9 vagy későbbi verzió szükséges, és megtalálható itt\n"
 "http://code.google.com/p/wkhtmltopdf/ Linux-hoz, Mac OS X (i386) és Windows "
@@ -5806,7 +5806,7 @@ msgstr ""
 "\n"
 "Az Odoo szerver gépen a könyvtár telepítése után, lehet, hogy be kell "
 "állítania\n"
-"a ``wkthtmltopdf`` futtatható fájl elérési útját a  Beállítások -> "
+"a ``wkhtmltopdf`` futtatható fájl elérési útját a  Beállítások -> "
 "Személyreszabás -> Paraméterek -> Rendszer Paraméterekben a ``webkit_path`` "
 "nevű rendszer paramétert. \n"
 "\n"
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index b17a1845c7d..6f6cbd5c9b8 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 0b371d74282..f7d05867eed 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -3293,7 +3293,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3301,7 +3301,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 59d11ef680e..b5e34c2e325 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -3273,7 +3273,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3281,7 +3281,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 6cd79a9e8e1..b7aa25a1b07 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -3692,7 +3692,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3700,7 +3700,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 380253c4b58..128156d7256 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -3355,7 +3355,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3363,7 +3363,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 9ed4b96be3d..5efd4dd1d7e 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -3299,7 +3299,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3307,7 +3307,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 73d1bfe60ef..1e573b175a4 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index e32dfdee708..aae232a52a2 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -3392,7 +3392,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3400,7 +3400,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 88ef144458f..d38654ce58a 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 11ba5e06077..83cd1f00b75 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -3272,7 +3272,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3280,7 +3280,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index c54b407175a..497ff11e6d0 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -3505,7 +3505,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3513,7 +3513,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 602291e693a..6dd2526949b 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -3985,7 +3985,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3993,7 +3993,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 2aac4a5ad4b..98a05d77b33 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -3611,7 +3611,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3619,7 +3619,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 6ab728f36f2..b1ab57a8ede 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -4461,7 +4461,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -4469,7 +4469,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index a090fc67fab..2083291daa7 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 010da8a4f98..cf3630907f2 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -3417,7 +3417,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3425,7 +3425,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index f821fabdf93..8d4269875b2 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -3400,7 +3400,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3408,7 +3408,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index bb90b562a82..1d99cdc9ffe 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -4713,7 +4713,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -4721,7 +4721,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index a88bfc3e36f..ca7502e6bf5 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -4724,7 +4724,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -4732,7 +4732,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 1e066a96ac3..fa4819d5192 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -3495,7 +3495,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3503,7 +3503,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 659ab4a392a..432ccfee1b9 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -3267,7 +3267,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3275,7 +3275,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index eb4c3b83717..fe99005ea19 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -4662,7 +4662,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -4670,7 +4670,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index b798e66ea80..763e8f01732 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 566001130ec..6214950b3ad 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -3266,7 +3266,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3274,7 +3274,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 2a005a17ab8..dc5761167ae 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -3356,7 +3356,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3364,7 +3364,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 1f52d105e62..e9ce65bacef 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -3286,7 +3286,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3294,7 +3294,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ta.po b/openerp/addons/base/i18n/ta.po
index 17c87ab0eb2..3c471cd34e6 100644
--- a/openerp/addons/base/i18n/ta.po
+++ b/openerp/addons/base/i18n/ta.po
@@ -3273,7 +3273,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3281,7 +3281,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index b1258a3a20f..78bb9e88f1e 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -3284,7 +3284,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3292,7 +3292,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index ccf458f2ab6..81fe772b411 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -3266,7 +3266,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3274,7 +3274,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 14e93b478a3..077eaef2722 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -3537,7 +3537,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3545,7 +3545,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 3bb8d1b9541..ca8556e5284 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 9d87697b449..431d52dc9b6 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -3266,7 +3266,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3274,7 +3274,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index e8d0881c16c..db882c4d091 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -3481,7 +3481,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3489,7 +3489,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 3dd1b7b470c..5e61fa55e79 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -3571,7 +3571,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3579,7 +3579,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 7c7254fcf01..686d320d35c 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -3263,7 +3263,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3271,7 +3271,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index da5d9cb441e..d1147420022 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -3298,7 +3298,7 @@ msgid ""
 "\n"
 "Requirements and Installation:\n"
 "------------------------------\n"
-"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"This module requires the ``wkhtmltopdf`` library to render HTML documents "
 "as\n"
 "PDF. Version 0.9.9 or later is necessary, and can be found at\n"
 "http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
@@ -3306,7 +3306,7 @@ msgid ""
 "\n"
 "After installing the library on the OpenERP Server machine, you may need to "
 "set\n"
-"the path to the ``wkthtmltopdf`` executable file in a system parameter "
+"the path to the ``wkhtmltopdf`` executable file in a system parameter "
 "named\n"
 "``webkit_path`` in Settings -> Customization -> Parameters -> System "
 "Parameters\n"

From f55a6046a831715d52ab3e82e777376d3d6d81b9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 9 Feb 2015 20:11:07 +0100
Subject: [PATCH 06/25] [FIX] account.move.line: no move revalidation for
 trivial changes

Many trivial changes to journal items, such as the
"blocked" flag for litigation (follow-up), do not affect
the balance of the whole entry. These should not cause
the account.move to be (re)validated.

For example it should be possible to change trivial
fields even on journal entries recorded in a closed
fiscal period.
---
 addons/account/account_move_line.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 29dfb139a64..820c29c5e58 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1172,9 +1172,11 @@ class account_move_line(osv.osv):
             raise osv.except_osv(_('Unable to change tax!'), _('You cannot change the tax, you should remove and recreate lines.'))
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
-        if update_check:
-            if ('account_id' in vals) or ('journal_id' in vals) or ('period_id' in vals) or ('move_id' in vals) or ('debit' in vals) or ('credit' in vals) or ('date' in vals):
-                self._update_check(cr, uid, ids, context)
+
+        affects_move = any(f in vals for f in ('account_id', 'journal_id', 'period_id', 'move_id', 'debit', 'credit', 'date'))
+
+        if update_check and affects_move:
+            self._update_check(cr, uid, ids, context)
 
         todo_date = None
         if vals.get('date', False):
@@ -1198,7 +1200,8 @@ class account_move_line(osv.osv):
             if journal.centralisation:
                 self._check_moves(cr, uid, context=ctx)
         result = super(account_move_line, self).write(cr, uid, ids, vals, context)
-        if check and not context.get('novalidate'):
+
+        if affects_move and check and not context.get('novalidate'):
             done = []
             for line in self.browse(cr, uid, ids):
                 if line.move_id.id not in done:

From 4ed38c2a920aeaacb70c2a81967b57d8f6bb26f6 Mon Sep 17 00:00:00 2001
From: Samus CTO <cto@openerp.com>
Date: Fri, 23 Jan 2015 10:00:11 +0100
Subject: [PATCH 07/25] [FIX] base: ambiguous @required for `name` of
 ir.actions subclasses

Column `name` is required in ir.actions, and thus
automatically required in subclasses such as `ir.actions.act_window`
and `ir.actions.act_url`, due to the specific PostgreSQL inheritance
mechanism. Mark it so in the model to make it explicit.
This does not change the database constraints, as they should already
be set though inheritance.

Closes #4861
---
 openerp/addons/base/ir/ir_actions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index c19d905eebb..c8abbf4f226 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -269,7 +269,7 @@ class ir_actions_act_window(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Action Name', translate=True),
+        'name': fields.char('Action Name', required=True, translate=True),
         'type': fields.char('Action Type', required=True),
         'view_id': fields.many2one('ir.ui.view', 'View Ref.', ondelete='set null'),
         'domain': fields.char('Domain Value',
@@ -405,7 +405,7 @@ class ir_actions_act_url(osv.osv):
     _sequence = 'ir_actions_id_seq'
     _order = 'name'
     _columns = {
-        'name': fields.char('Action Name', translate=True),
+        'name': fields.char('Action Name', required=True, translate=True),
         'type': fields.char('Action Type', required=True),
         'url': fields.text('Action URL',required=True),
         'target': fields.selection((

From 4ad329de55a96d0ff31bc13850945aacb89d0e30 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 12:26:31 +0100
Subject: [PATCH 08/25] [FIX] delivery: shipping invoice line depending on
 amount total
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The delivery module overrode the method _create_invoice_from_picking
to add the shipping costs according to the invoice and the shipping.

The issue is that the method _create_invoice_from_picking creates an empty
invoice, without any line. The lines are added afterwards, using the method
_create_invoice_line_from_vals, within the method _invoice_create_line.
So, after having called _create_invoice_from_picking, the invoice is indeed
created, but without lines, and therefore without the amount total value.
Adding the shipping costs there will thus prevent the shipping costs
based on the total price of the invoice (e.g. free for an order of 500€)

This rev. overrides the method _invoice_create_line instead, as, after
the call to this method, the invoice will be completely set, with all
its lines, and with a correct amount total. The side effect
is that we need to recompute the taxes a second time, using button_compute.

This is not the cleanest way to solve this issue. Indeed, a cleaner patch
would be to change the method _create_invoice_from_picking so it creates
the invoice along with its invoice lines, using the ORM command
(0, _, values) to creates the lines directly within the invoice creation:
invoice['invoice_line'] = [(0, _, values) for values in invoice_lines_vals].

Nevertheless, this is a bigger change, that will probably require API changes,
and therefore should be done in master.

opw-626226
opw-628517
---
 addons/delivery/stock.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 3d6a552245a..4e0071e066d 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -119,15 +119,22 @@ class stock_picking(osv.osv):
             'invoice_line_tax_id': [(6, 0, taxes_ids)],
         }
 
-    def _create_invoice_from_picking(self, cr, uid, picking, vals, context=None):
+    def _invoice_create_line(self, cr, uid, moves, journal_id, inv_type='out_invoice', context=None):
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
-        invoice_id = super(stock_picking, self)._create_invoice_from_picking(cr, uid, picking, vals, context=context)
-        invoice = invoice_obj.browse(cr, uid, invoice_id, context=context)
-        invoice_line = self._prepare_shipping_invoice_line(cr, uid, picking, invoice, context=context)
-        if invoice_line:
-            invoice_line_obj.create(cr, uid, invoice_line)
-        return invoice_id
+        invoice_ids = super(stock_picking, self)._invoice_create_line(cr, uid, moves, journal_id, inv_type=inv_type, context=context)
+        delivey_invoices = {}
+        for move in moves:
+            for invoice in move.picking_id.sale_id.invoice_ids:
+                if invoice.id in invoice_ids:
+                    delivey_invoices[invoice] = move.picking_id
+        if delivey_invoices:
+            for invoice, picking in delivey_invoices.items():
+                invoice_line = self._prepare_shipping_invoice_line(cr, uid, picking, invoice, context=context)
+                if invoice_line:
+                    invoice_line_obj.create(cr, uid, invoice_line)
+                    invoice_obj.button_compute(cr, uid, [invoice.id], context=context, set_total=(inv_type in ('in_invoice', 'in_refund')))
+        return invoice_ids
 
     def _get_default_uom(self, cr, uid, context=None):
         uom_categ_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'product.product_uom_categ_kgm')

From a5735e78912132b1adae3efcdaeb5d0277943903 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 20 Feb 2015 14:55:07 +0100
Subject: [PATCH 09/25] [FIX] website_forum{,_doc}: noupdate for website.menu

---
 addons/website_forum/data/forum_data.xml   | 15 ++++++++-------
 addons/website_forum_doc/data/doc_data.xml | 14 ++++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 8099bc56569..fd26dd91026 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
+    <data noupdate="1">
         <record id="forum_help" model="forum.forum">
             <field name="name">Help</field>
         </record>
@@ -12,7 +11,8 @@
             <field name="parent_id" ref="website.main_menu"/>
             <field name="sequence" type="int">35</field>
         </record>
-
+    </data>
+    <data>
         <function model="ir.config_parameter" name="set_param" eval="('auth_signup.allow_uninvited', True)" />
 
         <!-- JUMP TO FORUM AT INSTALL -->
@@ -22,10 +22,6 @@
             <!-- TODO in master : remove the tutorial or create one tutorial forum -->
             <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))+'/#tutorial.forum=true'"/>
         </record>
-        <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_open_forum"/>
-            <field name="state">open</field>
-        </record>
 
         <!-- Answers subtypes -->
         <record id="mt_answer_new" model="mail.message.subtype">
@@ -75,6 +71,11 @@
     </data>
     <data noupdate="1">
 
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_open_forum"/>
+            <field name="state">open</field>
+        </record>
+
         <!-- Reasons for closing Post -->
         <record id="reason_1" model="forum.post.reason">
             <field name="name">duplicate question</field>
diff --git a/addons/website_forum_doc/data/doc_data.xml b/addons/website_forum_doc/data/doc_data.xml
index 8252ff99d89..d9a6566d908 100644
--- a/addons/website_forum_doc/data/doc_data.xml
+++ b/addons/website_forum_doc/data/doc_data.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- JUMP TO DOCUMENTATION AT INSTALL -->
+        <record id="action_open_documentation" model="ir.actions.act_url">
+            <field name="name">Documentation</field>
+            <field name="target">self</field>
+            <field name="url" eval="'/forum/how-to'"/>
+        </record>
+    </data>
 
+    <data noupdate="1">
         <record id="menu_questions" model="website.menu">
             <field name="name">Documentation</field>
             <field name="url" eval="'/forum/how-to'"/>
@@ -9,12 +17,6 @@
             <field name="sequence" type="int">65</field>
         </record>
 
-        <!-- JUMP TO DOCUMENTATION AT INSTALL -->
-        <record id="action_open_documentation" model="ir.actions.act_url">
-            <field name="name">Documentation</field>
-            <field name="target">self</field>
-            <field name="url" eval="'/forum/how-to'"/>
-        </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_documentation"/>
             <field name="state">open</field>

From 5ee4028346bead1d116f831e25712a04b095abf2 Mon Sep 17 00:00:00 2001
From: Renzo Meister <rm@jamotion.ch>
Date: Thu, 19 Feb 2015 13:38:11 +0100
Subject: [PATCH 10/25] [CLA] Corporate CLA for Jamotion GmbH

Closes #5377
---
 doc/cla/corporate/jamotion.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/cla/corporate/jamotion.md

diff --git a/doc/cla/corporate/jamotion.md b/doc/cla/corporate/jamotion.md
new file mode 100644
index 00000000000..d7fd5029c63
--- /dev/null
+++ b/doc/cla/corporate/jamotion.md
@@ -0,0 +1,17 @@
+Switzerland, 19.02.2015
+
+Jamotion GmbH agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Renzo Meister, rm@jamotion.ch https://github.com/jamotion
+
+List of contributors:
+
+Renzo Meister, rm@jamotion.ch https://github.com/rm-jamotion
+Patrick Reiser, pr@jamotion.ch https://github.com/prjamo
+Gregor Lazzarato, gl@jamotion.ch https://github.com/gregorlazzarato

From d981f27dc1a577e9b6bc477c934fd75ede1e2983 Mon Sep 17 00:00:00 2001
From: "E.R. Spada II" <er@eugeconsulting.com>
Date: Tue, 17 Feb 2015 23:04:08 -0500
Subject: [PATCH 11/25] [CLA] Corporate CLA EUGE Consulting

Closes #5364
---
 doc/cla/corporate/eugeconsulting.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/cla/corporate/eugeconsulting.md

diff --git a/doc/cla/corporate/eugeconsulting.md b/doc/cla/corporate/eugeconsulting.md
new file mode 100644
index 00000000000..ae172b2f546
--- /dev/null
+++ b/doc/cla/corporate/eugeconsulting.md
@@ -0,0 +1,15 @@
+USA, 2015-02-17
+
+EUGE Consulting agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+E.R. Spada II er@eugeconsulting.com https://github.com/spadae22
+
+List of contributors:
+
+E.R. Spada II er@eugeconsulting.com https://github.com/spadae22

From 27a48f8026f824f62955d5bf2a83b2799ad98db1 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 15:24:18 +0100
Subject: [PATCH 12/25] [FIX] web: action translation (menuitems & more menu)

This rev. reverts partially 1d76586a1b0fff766581871cd277332bbfec030a
This rev. is related to #3462

Regarding addons/web/controllers/main.py
---
name of model ir.actions.actions is not translated
it's the name of server actions, client actions and window actions
that are translated.
Meaning the name of the ir.actions.actions will always be in English,
even when passing the user language within the context.

Regarding addons/web/static/src/js/views.js
---
There is no reason to pass the field values within the context
of the /web/action/load call: The read methods of actions are
not overidden to use the field values. Besides, it pollutes
the context of the action, leading to unwanted behavior, such
as the translation of the action name within the lang available in the
fields of the form view (e.g. the partner form).

Initially, the field values added in the context has been added
within the rev. 542928adde6f74269f51d24e18896b2e8bb44fc2
Indeed, sidebar_context (or sidebar_eval_context nowadays), contains
the field values, and the additional_context passed to /web/action/load
is an extension of this sidebar_context.
We are not sure the reasons why the sidebar_context was passed to the
/web/action/load, but we believe it was to pass the session/user context
containing the lang, timezone, and so on, not to pass the fields values.
---
 addons/web/controllers/main.py    | 4 ++--
 addons/web/static/src/js/views.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f5c31b2d1bf..b3acbbe5119 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1422,7 +1422,7 @@ class Action(openerpweb.Controller):
             except Exception:
                 action_id = 0   # force failed read
 
-        base_action = Actions.read([action_id], ['name', 'type'], req.session.get_context())
+        base_action = Actions.read([action_id], ['type'], req.context)
         if base_action:
             ctx = {}
             action_type = base_action[0]['type']
@@ -1431,7 +1431,7 @@ class Action(openerpweb.Controller):
             ctx.update(req.context)
             action = req.session.model(action_type).read([action_id], False, ctx)
             if action:
-                value = clean_action(req, dict(action[0], **base_action[0]))
+                value = clean_action(req, action[0])
         return value
 
     @openerpweb.jsonrequest
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5fa3c8fb290..5ae8bfc79fc 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1220,7 +1220,8 @@ instance.web.Sidebar = instance.web.Widget.extend({
                     sidebar_eval_context, active_ids_context));
             self.rpc("/web/action/load", {
                 action_id: item.action.id,
-                context: c
+                context: new instance.web.CompoundContext(
+                    self.dataset.get_context(), active_ids_context).eval()
             }).done(function(result) {
                 result.context = new instance.web.CompoundContext(
                     result.context || {}, active_ids_context)

From 4625b5c84010aef064a85a173bb22c5654b86c5c Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Fri, 20 Feb 2015 12:10:51 +0100
Subject: [PATCH 13/25] [FIX] speed up with sql query for picking assign

[IMP] Commit and limit query to 1
---
 addons/stock/stock.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index cdb86552cc5..4fa45f83c0e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2074,14 +2074,25 @@ class stock_move(osv.osv):
         (and company). Those attributes are also given as parameters.
         """
         pick_obj = self.pool.get("stock.picking")
-        picks = pick_obj.search(cr, uid, [
-                ('group_id', '=', procurement_group),
-                ('location_id', '=', location_from),
-                ('location_dest_id', '=', location_to),
-                ('state', 'in', ['draft', 'confirmed', 'waiting'])], context=context)
-        if picks:
-            pick = picks[0]
+        # Use a SQL query as doing with the ORM will split it in different queries with id IN (,,)
+        # In the next version, the locations on the picking should be stored again.
+        query = """
+            SELECT stock_picking.id FROM stock_picking, stock_move
+            WHERE
+                stock_picking.state in ('draft', 'confirmed', 'waiting') AND
+                stock_move.picking_id = stock_picking.id AND
+                stock_move.location_id = %s AND
+                stock_move.location_dest_id = %s AND
+        """
+        params = (location_from, location_to)
+        if not procurement_group:
+            query += "stock_picking.group_id IS NULL LIMIT 1"
         else:
+            query += "stock_picking.group_id = %s LIMIT 1"
+            params += (procurement_group,)
+        cr.execute(query, params)
+        pick = cr.fetchone()
+        if not pick:
             move = self.browse(cr, uid, move_ids, context=context)[0]
             values = {
                 'origin': move.origin,

From b8ecbe3191f86cd28272c2aa0f3900c527a060dd Mon Sep 17 00:00:00 2001
From: Denis Michiels <dmichiels@gmail.com>
Date: Fri, 20 Feb 2015 16:08:10 +0100
Subject: [PATCH 14/25] [FIX] google_drive : translate the record

Pass the context, with the language setting, when the record is read to
fill the google drive template. That allows to translate the name of the
document and all the informations inside.

opw-626675
---
 addons/google_drive/static/src/js/gdrive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index dbbe50d0794..6b5e1f83bf9 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -64,7 +64,7 @@ openerp.google_drive = function (instance, m) {
             var loaded = self.fetch('google.drive.config', ['google_drive_resource_id', 'google_drive_client_id'], [['id', '=', doc_item.config_id]])
                 .then(function (configs) {
                 var ds = new instance.web.DataSet(self, 'google.drive.config');
-                ds.call('get_google_drive_url', [doc_item.config_id, doc_item.res_id,configs[0].google_drive_resource_id]).done(function (url) {
+                ds.call('get_google_drive_url', [doc_item.config_id, doc_item.res_id,configs[0].google_drive_resource_id, self.dataset.context]).done(function (url) {
                     if (url){
                         window.open(url, '_blank');
                     }

From 6539104a4fc5f34b5f236877e6a7e3ee80af3db6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 16:10:23 +0100
Subject: [PATCH 15/25] [FIX] calendar: add followers to recurrent events

default_get method of mail.wizard.invite model uses
the key 'default_res_id' to retrieve the res_id of the record
to add the followers.

In the case of recurrent events, virtual ids are used, and
the conversion from virtual ids to real ids is needed.
---
 addons/calendar/calendar.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index c394fd5807a..a6ce57dfd27 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1825,6 +1825,8 @@ class invite_wizard(osv.osv_memory):
         '''
         in case someone clicked on 'invite others' wizard in the followers widget, transform virtual ids in real ids
         '''
+        if 'default_res_id' in context:
+            context['default_res_id'] = get_real_ids(context['default_res_id'])
         result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
         if 'res_id' in result:
             result['res_id'] = get_real_ids(result['res_id'])

From b2aa9c84298f479876a138467ca76eedc48060d0 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 20 Feb 2015 16:18:51 +0100
Subject: [PATCH 16/25] [FIX] website_blog: duplicate blog via front end.

Traceback because id was not casted: AccessError: ('AccessError', u"Database fetch misses ids (u'1') and has extra ids (1), may be caused by a type incoherence in a previous request")
---
 addons/website_blog/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index b8a7bf0ca03..dfa693c9099 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -314,7 +314,7 @@ class WebsiteBlog(http.Controller):
         """
         cr, uid, context = request.cr, request.uid, request.context
         create_context = dict(context, mail_create_nosubscribe=True)
-        nid = request.registry['blog.post'].copy(cr, uid, blog_post_id, {}, context=create_context)
+        nid = request.registry['blog.post'].copy(cr, uid, int(blog_post_id), {}, context=create_context)
         new_blog_post = request.registry['blog.post'].browse(cr, uid, nid, context=context)
         post = request.registry['blog.post'].browse(cr, uid, nid, context)
         return werkzeug.utils.redirect("/blog/%s/post/%s?enable_editor=1" % (slug(post.blog_id), slug(new_blog_post)))

From aae75f1e297cb6b370bac7341f54f310923fe5dc Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 16:19:44 +0100
Subject: [PATCH 17/25] [FIX] hr_expense: deprecated use of LocalService()

Introduced in a test, during the forward port 7613d5d49915b2257c9730dc0483ce0df2828b9f
---
 addons/hr_expense/tests/test_journal_entries.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/hr_expense/tests/test_journal_entries.py b/addons/hr_expense/tests/test_journal_entries.py
index 55251486607..4df277c3f49 100644
--- a/addons/hr_expense/tests/test_journal_entries.py
+++ b/addons/hr_expense/tests/test_journal_entries.py
@@ -1,5 +1,5 @@
 from openerp.tests.common import TransactionCase
-from openerp import netsvc
+from openerp import netsvc, workflow
 
 
 class TestCheckJournalEntry(TransactionCase):
@@ -13,7 +13,6 @@ class TestCheckJournalEntry(TransactionCase):
         self.expense_obj = self.registry('hr.expense.expense')
         self.exp_line_obj = self.registry('hr.expense.line')
         self.product_obj = self.registry('product.product')
-        self.wf_service = netsvc.LocalService('workflow')
         self.tax_obj = self.registry('account.tax')
         self.code_obj = self.registry('account.tax.code')
         _, self.product_id = self.registry("ir.model.data").get_object_reference(cr, uid, "hr_expense", "air_ticket")
@@ -43,11 +42,11 @@ class TestCheckJournalEntry(TransactionCase):
     def test_journal_entry(self):
         cr, uid = self.cr, self.uid
         #Submit to Manager
-        self.wf_service.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'confirm', cr)
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'confirm', cr)
         #Approve
-        self.wf_service.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'validate', cr)
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'validate', cr)
         #Create Expense Entries
-        self.wf_service.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'done', cr)
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'done', cr)
         self.expense = self.expense_obj.browse(cr, uid, self.expense_id)
         self.assertEquals(self.expense.state, 'done', 'Expense is not in Waiting Payment state')
         self.assertTrue(self.expense.account_move_id.id, 'Expense Journal Entry is not created')

From 337487db60daf423e740887b45bd69ba5be8c00d Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 20 Feb 2015 16:22:08 +0100
Subject: [PATCH 18/25] [FIX] website_blog: change name t-as to avoid to erase
 exisitng variable tag.

controller render with context { tags, tag, ... };
so use 't-foreach tags t-as tag', erase the 'tag' from controller.
---
 addons/website_blog/views/website_blog_templates.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 40bde2f411d..72b50f38001 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -161,8 +161,8 @@
     <xpath expr="//*[@name='blog_post_data']" position="inside">
         <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
             <span class="fa fa-tags"/>
-            <t t-foreach="blog_post.tag_ids" t-as="tag">
-                <a t-attf-href="#{blog_url(tag=tag)}" t-esc="tag.name"/> &amp;nbsp;
+            <t t-foreach="blog_post.tag_ids" t-as="one_tag">
+                <a t-attf-href="#{blog_url(tag=one_tag)}" t-esc="one_tag.name"/> &amp;nbsp;
             </t>
         </p>
     </xpath>
@@ -326,8 +326,8 @@
     <xpath expr="//p[@name='blog_post_data']" position="after">
         <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
             <span class="fa fa-tags"/>
-            <t t-foreach="blog_post.tag_ids" t-as="tag">
-                <a t-attf-href="#{blog_url(tag=tag)}" t-esc="tag.name"/> &amp;nbsp;
+            <t t-foreach="blog_post.tag_ids" t-as="one_tag">
+                <a t-attf-href="#{blog_url(tag=one_tag)}" t-esc="one_tag.name"/> &amp;nbsp;
             </t>
         </p>
     </xpath>

From a9ba27b79f563088f84667d5d1b405e5e87a369b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 20 Feb 2015 16:33:16 +0100
Subject: [PATCH 19/25] [FIX] stock: only get first element from cursor row

---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4fa45f83c0e..9c1bb5dd55b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2091,7 +2091,7 @@ class stock_move(osv.osv):
             query += "stock_picking.group_id = %s LIMIT 1"
             params += (procurement_group,)
         cr.execute(query, params)
-        pick = cr.fetchone()
+        [pick] = cr.fetchone() or [None]
         if not pick:
             move = self.browse(cr, uid, move_ids, context=context)[0]
             values = {

From 0200e31f7b704dd265c2a290697c80a286db5717 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 16:52:33 +0100
Subject: [PATCH 20/25] [FIX] calendar: context can be frozen in Odoo 8.0

---
 addons/calendar/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index a6ce57dfd27..9250e1a2a1c 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -1826,7 +1826,7 @@ class invite_wizard(osv.osv_memory):
         in case someone clicked on 'invite others' wizard in the followers widget, transform virtual ids in real ids
         '''
         if 'default_res_id' in context:
-            context['default_res_id'] = get_real_ids(context['default_res_id'])
+            context = dict(context, default_res_id=get_real_ids(context['default_res_id']))
         result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
         if 'res_id' in result:
             result['res_id'] = get_real_ids(result['res_id'])

From aca65438e80bca7ab20501d654099873cd424366 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 19 Feb 2015 13:50:24 +0100
Subject: [PATCH 21/25] [IMP] Packaging: version number in docker image name

---
 setup/package.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup/package.py b/setup/package.py
index 71de37bbf99..bdd5470e507 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -295,17 +295,17 @@ def _prepare_testing(o):
         # Use rsync to copy requirements.txt in order to keep original permissions
         subprocess.call(["rsync", "-a", "requirements.txt", os.path.join(o.build_dir, "docker_debian")],
                         cwd=os.path.join(o.odoo_dir))
-        subprocess.call(["docker", "build", "-t", "odoo-debian-nightly-tests", "."],
+        subprocess.call(["docker", "build", "-t", "odoo-%s-debian-nightly-tests" % version, "."],
                         cwd=os.path.join(o.build_dir, "docker_debian"))
     if not o.no_rpm:
         subprocess.call(["mkdir", "docker_centos"], cwd=o.build_dir)
         subprocess.call(["cp", "package.dfcentos", os.path.join(o.build_dir, "docker_centos", "Dockerfile")],
                         cwd=os.path.join(o.odoo_dir, "setup"))
-        subprocess.call(["docker", "build", "-t", "odoo-centos-nightly-tests", "."],
+        subprocess.call(["docker", "build", "-t", "odoo-%s-centos-nightly-tests" % version, "."],
                         cwd=os.path.join(o.build_dir, "docker_centos"))
 
 def test_tgz(o):
-    with docker('odoo-debian-nightly-tests', o.build_dir, o.pub) as wheezy:
+    with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
         wheezy.release = '*.tar.gz'
         wheezy.system("service postgresql start")
         wheezy.system('/usr/local/bin/pip install /opt/release/%s' % wheezy.release)
@@ -318,7 +318,7 @@ def test_tgz(o):
         wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany &"')
 
 def test_deb(o):
-    with docker('odoo-debian-nightly-tests', o.build_dir, o.pub) as wheezy:
+    with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
         wheezy.release = '*.deb'
         wheezy.system("service postgresql start")
         wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"')
@@ -328,7 +328,7 @@ def test_deb(o):
         wheezy.system('su odoo -s /bin/bash -c "odoo.py -c /etc/odoo/openerp-server.conf -d mycompany &"')
 
 def test_rpm(o):
-    with docker('odoo-centos-nightly-tests', o.build_dir, o.pub) as centos7:
+    with docker('odoo-%s-centos-nightly-tests' % version, o.build_dir, o.pub) as centos7:
         centos7.release = '*.noarch.rpm'
         # Start postgresql
         centos7.system('su postgres -c "/usr/bin/pg_ctl -D /var/lib/postgres/data start"')

From 520360d80b0af02f9afc806e3bb5c1400b641cba Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 19 Feb 2015 18:02:19 +0100
Subject: [PATCH 22/25] [ADD] Packaging: nightly tests: src dockerfile

Creation of a Dockerfile for the src package for nightly tests.
Remove unnecessary libraries installation from the Debian Dockerfile.
---
 setup/package.dfdebian | 18 ++----------------
 setup/package.dfsrc    | 42 ++++++++++++++++++++++++++++++++++++++++++
 setup/package.py       | 13 +++++++++++--
 3 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 setup/package.dfsrc

diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index f59233e4db4..7a96a560792 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -19,19 +19,9 @@ ENV LC_ALL C.UTF-8
 RUN apt-get update -qq &&  \
 	apt-get upgrade -qq -y && \
 	apt-get install \
-		postgresql \
-		postgresql-server-dev-all \
-		postgresql-client \
 		adduser \
-		libxml2-dev \
-		libxslt1-dev \
-		libldap2-dev \
-		libsasl2-dev \
-		libssl-dev \
-		libjpeg-dev \
-		python-dev \
-		python-pip \
-		build-essential \
+		postgresql \
+		postgresql-client \
 		python \
 		python-dateutil \
 		python-decorator \
@@ -65,8 +55,4 @@ RUN apt-get update -qq &&  \
 		python-yaml -y && \
 	rm -rf /var/lib/apt/lists/*
 
-COPY requirements.txt /opt/release/requirements.txt
-
-RUN pip install -r /opt/release/requirements.txt
-
 RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
diff --git a/setup/package.dfsrc b/setup/package.dfsrc
new file mode 100644
index 00000000000..3b1f4cdfd09
--- /dev/null
+++ b/setup/package.dfsrc
@@ -0,0 +1,42 @@
+# Please note that this Dockerfile is used for testing nightly builds and should
+# not be used to deploy Odoo
+FROM debian:stable
+MAINTAINER Odoo S.A. <info@odoo.com>
+
+# Change policy-rc.d so that services start automatically once installed
+RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d
+
+RUN apt-get update && \
+	apt-get install -y locales && \
+	rm -rf /var/lib/apt/lists/*
+
+# Reconfigure locales such that postgresql uses UTF-8 encoding
+RUN dpkg-reconfigure locales && \
+    locale-gen C.UTF-8 && \
+    /usr/sbin/update-locale LANG=C.UTF-8
+ENV LC_ALL C.UTF-8
+
+RUN apt-get update -qq &&  \
+	apt-get upgrade -qq -y && \
+	apt-get install \
+		postgresql \
+		postgresql-server-dev-all \
+		postgresql-client \
+		adduser \
+		libxml2-dev \
+		libxslt1-dev \
+		libldap2-dev \
+		libsasl2-dev \
+		libssl-dev \
+		libjpeg-dev \
+		python-dev \
+		python-pip \
+		build-essential \
+		python -y && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt /opt/release/requirements.txt
+
+RUN pip install -r /opt/release/requirements.txt
+
+RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
diff --git a/setup/package.py b/setup/package.py
index bdd5470e507..24f7afa1e65 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -288,7 +288,16 @@ def build_exe(o):
 # Stage: testing
 #----------------------------------------------------------
 def _prepare_testing(o):
-    if not o.no_tarball or not o.no_debian:
+    if not o.no_tarball:
+        subprocess.call(["mkdir", "docker_src"], cwd=o.build_dir)
+        subprocess.call(["cp", "package.dfsrc", os.path.join(o.build_dir, "docker_src", "Dockerfile")],
+                        cwd=os.path.join(o.odoo_dir, "setup"))
+        # Use rsync to copy requirements.txt in order to keep original permissions
+        subprocess.call(["rsync", "-a", "requirements.txt", os.path.join(o.build_dir, "docker_src")],
+                        cwd=os.path.join(o.odoo_dir))
+        subprocess.call(["docker", "build", "-t", "odoo-%s-src-nightly-tests" % version, "."],
+                        cwd=os.path.join(o.build_dir, "docker_src"))
+    if not o.no_debian:
         subprocess.call(["mkdir", "docker_debian"], cwd=o.build_dir)
         subprocess.call(["cp", "package.dfdebian", os.path.join(o.build_dir, "docker_debian", "Dockerfile")],
                         cwd=os.path.join(o.odoo_dir, "setup"))
@@ -305,7 +314,7 @@ def _prepare_testing(o):
                         cwd=os.path.join(o.build_dir, "docker_centos"))
 
 def test_tgz(o):
-    with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
+    with docker('odoo-%s-src-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
         wheezy.release = '*.tar.gz'
         wheezy.system("service postgresql start")
         wheezy.system('/usr/local/bin/pip install /opt/release/%s' % wheezy.release)

From d5c4a1c3e13ba90d0ef51e3d7e93094e573c32f2 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 20 Feb 2015 12:53:33 +0100
Subject: [PATCH 23/25] [FIX] Packaging: possibility to have a PGP key without
 passphrase

---
 setup/package.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/package.py b/setup/package.py
index 24f7afa1e65..17668545847 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -266,11 +266,12 @@ def build_deb(o):
     subprocess.call(cmd, cwd=o.build_dir)
     deb = pexpect.spawn('dpkg-buildpackage -rfakeroot -k%s' % GPGID, cwd=o.build_dir)
     deb.logfile = stdout
-    deb.expect_exact('Enter passphrase: ', timeout=1200)
-    deb.send(GPGPASSPHRASE + '\r\n')
-    deb.expect_exact('Enter passphrase: ')
-    deb.send(GPGPASSPHRASE + '\r\n')
-    deb.expect(pexpect.EOF)
+    if GPGPASSPHRASE:
+        deb.expect_exact('Enter passphrase: ', timeout=1200)
+        deb.send(GPGPASSPHRASE + '\r\n')
+        deb.expect_exact('Enter passphrase: ')
+        deb.send(GPGPASSPHRASE + '\r\n')
+    deb.expect(pexpect.EOF, timeout=1200)
     system(['mv', glob('%s/../odoo_*.deb' % o.build_dir)[0], '%s' % o.build_dir])
     system(['mv', glob('%s/../odoo_*.dsc' % o.build_dir)[0], '%s' % o.build_dir])
     system(['mv', glob('%s/../odoo_*_amd64.changes' % o.build_dir)[0], '%s' % o.build_dir])

From 2e7347dba5f3bd09deb28a8c91a11d65d13bdd14 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 17:12:34 +0100
Subject: [PATCH 24/25] [FIX] translate: possibility to disable translation of
 view nodes

Node content of inherited views using <attribute> tags are added
in the translation terms when syncing the terms.

The fact that the content should be translated or not depends
on the content, or to which attribute it refers.
For instance, string attributes should be translated, but
domains probably not.
But, even for domains, this is possible that it requires a translation
e.g. [('category_id.name', 'ilike', 'Customers')].
This domain is very unlikely to be integrated in the standard source code,
but this is possible to have such a domain in a view customization.

Therefore, we provide the possibility to disable the translation
case by case. Setting translation="off" in the attribute of the node
will prevent to add the node content in the translated terms.

opw-625762
---
 openerp/tools/translate.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index 073b3d8ed5b..65741424d5e 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -578,6 +578,7 @@ def trans_parse_view(element, callback):
     for el in element.iter():
         if (not isinstance(el, SKIPPED_ELEMENT_TYPES)
                 and el.tag.lower() not in SKIPPED_ELEMENTS
+                and el.get("translation", '').strip() != "off"
                 and el.text):
             _push(callback, el.text, el.sourceline)
         if el.tail:

From d350f5b59e8905a76e965b6f34a0db14dbb53af0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 20 Feb 2015 17:25:30 +0100
Subject: [PATCH 25/25] [FIX] hr_expense: deprecated use of fast_suite

Introduced during forward port b0be8dfdfd78c7953c1f60bf86b862bc46abd65c
---
 addons/hr_expense/tests/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/hr_expense/tests/__init__.py b/addons/hr_expense/tests/__init__.py
index 8c94d56e555..ddaeb0a7612 100644
--- a/addons/hr_expense/tests/__init__.py
+++ b/addons/hr_expense/tests/__init__.py
@@ -1,5 +1 @@
 from . import test_journal_entries
-
-fast_suite = [
-    test_journal_entries
-]
\ No newline at end of file