[MERGE] forward port of branch 8.0 up to d350f5b

2015-02-20 18:16:01 +01:00
parent e13923c0db d350f5b59e
commit aec02cb493
100 changed files with 400 additions and 238 deletions
@@ -1176,9 +1176,11 @@ class account_move_line(osv.osv):
            raise UserError(_('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 UserError(_('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):
@@ -1202,7 +1204,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:
@@ -1378,7 +1381,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'],
@@ -1826,6 +1826,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 = 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'])
@@ -117,15 +117,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')
@@ -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');
                    }
@@ -318,7 +318,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:
@@ -329,7 +329,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'],
@@ -0,0 +1 @@
+from . import test_journal_entries
@@ -0,0 +1,60 @@
+from openerp.tests.common import TransactionCase
+from openerp import netsvc, workflow
+
+
+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.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
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'confirm', cr)
+        #Approve
+        workflow.trg_validate(uid, 'hr.expense.expense', self.expense_id, 'validate', cr)
+        #Create Expense Entries
+        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')
+        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')
@@ -95,7 +95,7 @@
                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type_icon + '.png'"></img>
                        <div class='oe_name'><t t-raw='attachment.name' /></div>
                    </a>
-                    <div class="oe_delete">
+                    <div class="oe_delete" t-if="!attachment.upload">
                        <i class='fa fa-times-circle' title="Delete this attachment" t-att-data-id="attachment.id"/>
                    </div>
                    <div class='oe_progress_bar'>
@@ -109,7 +109,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">
+                    <div class="oe_delete" t-if="!attachment.upload">
                        <i class='fa fa-times-circle' title="Delete this attachment" t-att-data-id="attachment.id"/>
                    </div>
                    <div class='oe_progress_bar'>
@@ -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
@@ -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"
@@ -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"
@@ -1255,7 +1255,7 @@ class Action(http.Controller):
            except Exception:
                action_id = 0   # force failed read

-        base_action = Actions.read([action_id], ['name', 'type'], request.context)
+        base_action = Actions.read([action_id], ['type'], request.context)
        if base_action:
            ctx = request.context
            action_type = base_action[0]['type']
@@ -1265,7 +1265,7 @@ class Action(http.Controller):
                ctx.update(additional_context)
            action = request.session.model(action_type).read([action_id], False, ctx)
            if action:
-                value = clean_action(dict(action[0], **base_action[0]))
+                value = clean_action(action[0])
        return value

    @http.route('/web/action/run', type='json', auth="user")
@@ -1144,7 +1144,8 @@ instance.web.Sidebar = instance.web.Widget.extend({

                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)
@@ -178,8 +178,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.id, date_begin=False, date_end=False)}" 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.id, date_begin=False, date_end=False)}" t-esc="one_tag.name"/> &amp;nbsp;
            </t>
        </p>
    </xpath>
@@ -334,8 +334,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.id)}" 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.id)}" t-esc="one_tag.name"/> &amp;nbsp;
            </t>
        </p>
    </xpath>
@@ -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 -->
@@ -21,10 +21,6 @@
            <field name="target">self</field>
            <field name="url" eval="'/forum/'+str(ref('website_forum.forum_help'))"/>
        </record>
-        <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_open_forum"/>
-            <field name="state">open</field>
-        </record>

        <!-- Set Admin karma -->
        <record id="base.user_root" model="res.users">
@@ -79,6 +75,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 post</field>
@@ -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>
@@ -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);
            }
        });
    })(); }
@@ -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
@@ -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
@@ -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
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3242,7 +3242,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 "
@@ -3250,7 +3250,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"
@@ -3271,7 +3271,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 "
@@ -3279,7 +3279,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"
@@ -3246,7 +3246,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 "
@@ -3254,7 +3254,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"
@@ -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"
@@ -3290,7 +3290,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 "
@@ -3298,7 +3298,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3292,7 +3292,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 "
@@ -3300,7 +3300,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"
@@ -3262,7 +3262,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 "
@@ -3270,7 +3270,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"
@@ -3635,7 +3635,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 "
@@ -3643,7 +3643,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"
@@ -3246,7 +3246,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 "
@@ -3254,7 +3254,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"
@@ -5293,7 +5293,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 "
@@ -5301,7 +5301,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"
@@ -5353,7 +5353,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"
@@ -5362,7 +5362,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, "
@@ -5495,7 +5495,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 "
@@ -5503,7 +5503,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"
@@ -5552,7 +5552,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 "
@@ -5560,7 +5560,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"
@@ -3718,7 +3718,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 "
@@ -3726,7 +3726,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"
@@ -5539,7 +5539,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 "
@@ -5547,7 +5547,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"
@@ -5595,14 +5595,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"
@@ -3836,7 +3836,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 "
@@ -3844,7 +3844,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3242,7 +3242,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 "
@@ -3250,7 +3250,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"
@@ -3357,7 +3357,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 "
@@ -3365,7 +3365,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"
@@ -3778,7 +3778,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 "
@@ -3786,7 +3786,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"
@@ -3305,7 +3305,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 "
@@ -3313,7 +3313,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3245,7 +3245,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 "
@@ -3253,7 +3253,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"
@@ -3240,7 +3240,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 "
@@ -3248,7 +3248,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3243,7 +3243,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 "
@@ -3251,7 +3251,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"
@@ -3243,7 +3243,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 "
@@ -3251,7 +3251,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3352,7 +3352,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 "
@@ -3360,7 +3360,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"
@@ -4037,7 +4037,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 "
@@ -4045,7 +4045,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"
@@ -3309,7 +3309,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 "
@@ -3317,7 +3317,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"
@@ -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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3291,7 +3291,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 "
@@ -3299,7 +3299,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"
@@ -3242,7 +3242,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 "
@@ -3250,7 +3250,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"
@@ -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"
@@ -5705,7 +5705,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 "
@@ -5713,7 +5713,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"
@@ -5760,7 +5760,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 "
@@ -5768,7 +5768,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3668,7 +3668,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 "
@@ -3676,7 +3676,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"
@@ -3331,7 +3331,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 "
@@ -3339,7 +3339,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"
@@ -3275,7 +3275,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 "
@@ -3283,7 +3283,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3368,7 +3368,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 "
@@ -3376,7 +3376,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3248,7 +3248,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 "
@@ -3256,7 +3256,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"
@@ -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"
@@ -3961,7 +3961,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 "
@@ -3969,7 +3969,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"
@@ -3587,7 +3587,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 "
@@ -3595,7 +3595,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"
@@ -4445,7 +4445,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 "
@@ -4453,7 +4453,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3391,7 +3391,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 "
@@ -3399,7 +3399,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"
@@ -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"
@@ -4711,7 +4711,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 "
@@ -4719,7 +4719,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"
@@ -4722,7 +4722,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 "
@@ -4730,7 +4730,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"
@@ -3471,7 +3471,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 "
@@ -3479,7 +3479,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"
@@ -3243,7 +3243,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 "
@@ -3251,7 +3251,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"
@@ -4654,7 +4654,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 "
@@ -4662,7 +4662,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3242,7 +3242,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 "
@@ -3250,7 +3250,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"
@@ -3332,7 +3332,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 "
@@ -3340,7 +3340,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"
@@ -3262,7 +3262,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 "
@@ -3270,7 +3270,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"
@@ -3249,7 +3249,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 "
@@ -3257,7 +3257,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"
@@ -3260,7 +3260,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 "
@@ -3268,7 +3268,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3513,7 +3513,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 "
@@ -3521,7 +3521,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3242,7 +3242,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 "
@@ -3250,7 +3250,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"
@@ -3457,7 +3457,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 "
@@ -3465,7 +3465,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"
@@ -3547,7 +3547,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 "
@@ -3555,7 +3555,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"
@@ -3239,7 +3239,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 "
@@ -3247,7 +3247,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"
@@ -3274,7 +3274,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 "
@@ -3282,7 +3282,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"
@@ -312,7 +312,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',
@@ -449,7 +449,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((
@@ -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:
@@ -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
@@ -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
@@ -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])
@@ -288,24 +289,33 @@ 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"))
        # 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-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)
@@ -318,7 +328,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 +338,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"')