diff options
100 files changed, 399 insertions, 237 deletions
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index d75d4eb3d61..2c1422c1369 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -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'], diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index 8a2cac738b4..19aa9ed7d0b 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -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']) diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index 3f28e553a29..28040e25553 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -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') diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js index 98324c1c288..07f0e9e37eb 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'); } diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 09c6d4bee84..e260bf47a37 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -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'], diff --git a/addons/hr_expense/tests/__init__.py b/addons/hr_expense/tests/__init__.py new file mode 100644 index 00000000000..ddaeb0a7612 --- /dev/null +++ b/addons/hr_expense/tests/__init__.py @@ -0,0 +1 @@ +from . import test_journal_entries 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..4df277c3f49 --- /dev/null +++ b/addons/hr_expense/tests/test_journal_entries.py @@ -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') diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index bb5a41cccd6..05ed0debb5d 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -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'> diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index 923006965eb..c5442e0e5be 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/addons/web/controllers/main.py b/addons/web/controllers/main.py index 2ed235c979e..7bea7f50111 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -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") diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index e374350397d..3b6ec4d794c 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -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) diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 66c4a10d08b..0dc46173502 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -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"/> &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"/> &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"/> &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"/> &nbsp; </t> </p> </xpath> diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml index ba317fba4f7..e804525be18 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 --> @@ -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> 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> 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); } }); })(); } 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 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 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 064d75e1e94..2ca9c421637 100644 --- a/openerp/addons/base/i18n/ab.po +++ b/openerp/addons/base/i18n/ab.po @@ -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" diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index fdbac83cb78..17441d52482 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.po @@ -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" diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po index 261746c23fe..9cd55512ba3 100644 --- a/openerp/addons/base/i18n/am.po +++ b/openerp/addons/base/i18n/am.po @@ -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" diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po index 599700ce26b..479e6f4e87e 100644 --- a/openerp/addons/base/i18n/ar.po +++ b/openerp/addons/base/i18n/ar.po @@ -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" diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot index b2b77cc498a..a3232031ffa 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 68dfb42d6e1..6e074a3a7bd 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/i18n/bg.po @@ -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" diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po index 8d6c098d15b..a2cced8beb1 100644 --- a/openerp/addons/base/i18n/bn.po +++ b/openerp/addons/base/i18n/bn.po @@ -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" diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po index dc162326509..816b9647779 100644 --- a/openerp/addons/base/i18n/bs.po +++ b/openerp/addons/base/i18n/bs.po @@ -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" diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po index a685e95e457..c091b72b9b0 100644 --- a/openerp/addons/base/i18n/ca.po +++ b/openerp/addons/base/i18n/ca.po @@ -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" diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index 4520c80b2e8..caf8eca6cbe 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/i18n/cs.po @@ -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" diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po index e66828dfe91..b5f2e6f7617 100644 --- a/openerp/addons/base/i18n/da.po +++ b/openerp/addons/base/i18n/da.po @@ -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" diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index 3dcb2962e63..9cbe4dcc27a 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -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, " diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po index e2baa2af7d9..639e36037f2 100644 --- a/openerp/addons/base/i18n/el.po +++ b/openerp/addons/base/i18n/el.po @@ -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" diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po index 54f5f83d095..30963a8e73f 100644 --- a/openerp/addons/base/i18n/en_GB.po +++ b/openerp/addons/base/i18n/en_GB.po @@ -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" diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po index f45c4148f7e..341eb4d631b 100644 --- a/openerp/addons/base/i18n/es.po +++ b/openerp/addons/base/i18n/es.po @@ -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" diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po index 6dc8ba6066b..5e72800e882 100644 --- a/openerp/addons/base/i18n/es_AR.po +++ b/openerp/addons/base/i18n/es_AR.po @@ -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" diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po index c4f414e70d7..3117f705361 100644 --- a/openerp/addons/base/i18n/es_BO.po +++ b/openerp/addons/base/i18n/es_BO.po @@ -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" diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index b6977c6978e..0159e3db865 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.po @@ -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" diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po index a5e3e1968b7..dc6283382c4 100644 --- a/openerp/addons/base/i18n/es_CR.po +++ b/openerp/addons/base/i18n/es_CR.po @@ -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" diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po index baa566fdd74..e3006d93a43 100644 --- a/openerp/addons/base/i18n/es_DO.po +++ b/openerp/addons/base/i18n/es_DO.po @@ -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" diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po index 4701f24563d..cabea838b6a 100644 --- a/openerp/addons/base/i18n/es_EC.po +++ b/openerp/addons/base/i18n/es_EC.po @@ -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" diff --git a/openerp/addons/base/i18n/es_HN.po b/openerp/addons/base/i18n/es_HN.po index 5d892b54d54..a64c149e005 100644 --- a/openerp/addons/base/i18n/es_HN.po +++ b/openerp/addons/base/i18n/es_HN.po @@ -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" diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po index 8e87114f027..183568b9785 100644 --- a/openerp/addons/base/i18n/es_MX.po +++ b/openerp/addons/base/i18n/es_MX.po @@ -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" diff --git a/openerp/addons/base/i18n/es_PA.po b/openerp/addons/base/i18n/es_PA.po index 2b64a25cde2..da5a6df0b0c 100644 --- a/openerp/addons/base/i18n/es_PA.po +++ b/openerp/addons/base/i18n/es_PA.po @@ -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" diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po index 00049b5c8fd..bb1f4eed2dc 100644 --- a/openerp/addons/base/i18n/es_PE.po +++ b/openerp/addons/base/i18n/es_PE.po @@ -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" diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po index ead09d09c1c..254056e69c1 100644 --- a/openerp/addons/base/i18n/es_VE.po +++ b/openerp/addons/base/i18n/es_VE.po @@ -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" diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po index d38e1518a38..78f606d226b 100644 --- a/openerp/addons/base/i18n/et.po +++ b/openerp/addons/base/i18n/et.po @@ -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" diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po index ae46a3205a9..bcc0bffeeba 100644 --- a/openerp/addons/base/i18n/eu.po +++ b/openerp/addons/base/i18n/eu.po @@ -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" diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po index 68e7a01c103..a3bd39a747e 100644 --- a/openerp/addons/base/i18n/fa.po +++ b/openerp/addons/base/i18n/fa.po @@ -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" diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po index bdcc5839cd5..57c18d440a4 100644 --- a/openerp/addons/base/i18n/fa_AF.po +++ b/openerp/addons/base/i18n/fa_AF.po @@ -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" diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po index 5d30b29a461..8d5278dee2b 100644 --- a/openerp/addons/base/i18n/fi.po +++ b/openerp/addons/base/i18n/fi.po @@ -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" diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index e37563f1371..899027f2bcb 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -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" diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po index 54ae86615f6..d0c34265e18 100644 --- a/openerp/addons/base/i18n/fr_CA.po +++ b/openerp/addons/base/i18n/fr_CA.po @@ -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" diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po index 92155cd9edc..d35e3cbf862 100644 --- a/openerp/addons/base/i18n/gl.po +++ b/openerp/addons/base/i18n/gl.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/gu.po b/openerp/addons/base/i18n/gu.po index 22a6ab7dc4c..a88cfca5511 100644 --- a/openerp/addons/base/i18n/gu.po +++ b/openerp/addons/base/i18n/gu.po @@ -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" diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po index b4067d1de53..6ebf185f9f7 100644 --- a/openerp/addons/base/i18n/he.po +++ b/openerp/addons/base/i18n/he.po @@ -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" diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po index 6b1560f89fd..bb1b3648ead 100644 --- a/openerp/addons/base/i18n/hi.po +++ b/openerp/addons/base/i18n/hi.po @@ -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" diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po index 4ae865c8240..f03a9e5d314 100644 --- a/openerp/addons/base/i18n/hr.po +++ b/openerp/addons/base/i18n/hr.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/hu.po b/openerp/addons/base/i18n/hu.po index 6a5d356a383..d1f89259388 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/i18n/hu.po @@ -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" diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po index 87c8d9b9680..cbbf93dd893 100644 --- a/openerp/addons/base/i18n/hy.po +++ b/openerp/addons/base/i18n/hy.po @@ -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" diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index 37adfba9e1e..37bf61e79c6 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.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/is.po b/openerp/addons/base/i18n/is.po index b772aa7a391..62fff6862d4 100644 --- a/openerp/addons/base/i18n/is.po +++ b/openerp/addons/base/i18n/is.po @@ -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" diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po index 18e71410bbe..76c0b9d8830 100644 --- a/openerp/addons/base/i18n/it.po +++ b/openerp/addons/base/i18n/it.po @@ -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" diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index f99524f1fa1..592c8689390 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -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" diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po index 845f2f3992a..cad057e3864 100644 --- a/openerp/addons/base/i18n/ka.po +++ b/openerp/addons/base/i18n/ka.po @@ -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" diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po index 9754a6f5e70..859186d1eae 100644 --- a/openerp/addons/base/i18n/kk.po +++ b/openerp/addons/base/i18n/kk.po @@ -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" diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index ddaf4a28f8e..0174f37e495 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/i18n/ko.po @@ -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" diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po index e2e838ec1ef..24fe3632531 100644 --- a/openerp/addons/base/i18n/lt.po +++ b/openerp/addons/base/i18n/lt.po @@ -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" diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po index 32dde0f9a96..28d5f896faf 100644 --- a/openerp/addons/base/i18n/lv.po +++ b/openerp/addons/base/i18n/lv.po @@ -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" diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po index 682cd340aa1..bf91b5329d8 100644 --- a/openerp/addons/base/i18n/mk.po +++ b/openerp/addons/base/i18n/mk.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/mn.po b/openerp/addons/base/i18n/mn.po index f9abd371ba6..ccfa1901ae6 100644 --- a/openerp/addons/base/i18n/mn.po +++ b/openerp/addons/base/i18n/mn.po @@ -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" diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index d9cccce959c..322936c21f8 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.po @@ -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" diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 5f61aaec4bd..ec161dd6b05 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -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" diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index d309f6b0595..ed21b5049f4 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.po @@ -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" diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index 644b89d5e57..68c4c24615b 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/i18n/pl.po @@ -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" diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index 96ec5bf6889..68fd2188b6f 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/i18n/pt.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/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index 6d18b8cd3ca..f69ceb3370b 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -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" diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index 780467fdb18..2e99af10d00 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/i18n/ro.po @@ -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" diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index aa10a09b3d0..e7e1cbba20d 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/i18n/ru.po @@ -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" diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po index d069aab7861..892f07c478b 100644 --- a/openerp/addons/base/i18n/sk.po +++ b/openerp/addons/base/i18n/sk.po @@ -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" diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index 633f2cbf8f1..11a5e170c92 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/i18n/sl.po @@ -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" diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po index c5b23c66261..ce6ff4488f1 100644 --- a/openerp/addons/base/i18n/sq.po +++ b/openerp/addons/base/i18n/sq.po @@ -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" diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po index a74c70946c5..87d75fcec6c 100644 --- a/openerp/addons/base/i18n/sr.po +++ b/openerp/addons/base/i18n/sr.po @@ -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" diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po index 9e8feda4b9e..c52189a9ab3 100644 --- a/openerp/addons/base/i18n/sr@latin.po +++ b/openerp/addons/base/i18n/sr@latin.po @@ -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" diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po index 545d945b288..c78edb81c77 100644 --- a/openerp/addons/base/i18n/sv.po +++ b/openerp/addons/base/i18n/sv.po @@ -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" diff --git a/openerp/addons/base/i18n/ta.po b/openerp/addons/base/i18n/ta.po index 5a284c896a0..7b3dbc942d4 100644 --- a/openerp/addons/base/i18n/ta.po +++ b/openerp/addons/base/i18n/ta.po @@ -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" diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po index 2f526266d6b..b8396179a20 100644 --- a/openerp/addons/base/i18n/th.po +++ b/openerp/addons/base/i18n/th.po @@ -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" diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index 58fc2953e9e..4c2e4d3635f 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/i18n/tlh.po @@ -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" diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index 0ed19f733e2..2c31ee67bf2 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/i18n/tr.po @@ -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" diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po index e4299dfec75..3cfe1eed23f 100644 --- a/openerp/addons/base/i18n/uk.po +++ b/openerp/addons/base/i18n/uk.po @@ -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" diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po index 24f1da2bd17..010771352a4 100644 --- a/openerp/addons/base/i18n/ur.po +++ b/openerp/addons/base/i18n/ur.po @@ -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" diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po index 32a825b586b..43b52c362c5 100644 --- a/openerp/addons/base/i18n/vi.po +++ b/openerp/addons/base/i18n/vi.po @@ -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" diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po index 8a7ffd6cb50..4df4805edec 100644 --- a/openerp/addons/base/i18n/zh_CN.po +++ b/openerp/addons/base/i18n/zh_CN.po @@ -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" diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po index e2365055c7c..e313932ab3f 100644 --- a/openerp/addons/base/i18n/zh_HK.po +++ b/openerp/addons/base/i18n/zh_HK.po @@ -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" diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po index 42de88857b7..21ca0b32a70 100644 --- a/openerp/addons/base/i18n/zh_TW.po +++ b/openerp/addons/base/i18n/zh_TW.po @@ -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" diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index f2f558e65ac..2b7e2616151 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -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(( diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 69733399478..a40a05241c7 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: 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 \ + adduser \ 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 \ 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 71de37bbf99..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]) @@ -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"') |