From 1daeaed37646208f5f1f94afe900c6f78edd621d Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 18 Feb 2014 13:32:11 +0100 Subject: [PATCH 01/18] [FIX] use copy_data rather than doing a write after that the moves are created lp bug: https://launchpad.net/bugs/1281558 fixed bzr revid: guewen.baconnier@camptocamp.com-20140218123211-3l3bvi3at1s91lfi --- addons/stock/stock.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 02fd28611e6..53f43f73083 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -727,10 +727,6 @@ class stock_picking(osv.osv): if 'invoice_state' not in default and picking_obj.invoice_state == 'invoiced': default['invoice_state'] = '2binvoiced' res = super(stock_picking, self).copy(cr, uid, id, default, context) - if res: - picking_obj = self.browse(cr, uid, res, context=context) - for move in picking_obj.move_lines: - move_obj.write(cr, uid, [move.id], {'tracking_id': False, 'prodlot_id': False, 'move_history_ids2': [(6, 0, [])], 'move_history_ids': [(6, 0, [])]}) return res def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): @@ -1806,12 +1802,17 @@ class stock_move(osv.osv): _('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).')) return super(stock_move, self).write(cr, uid, ids, vals, context=context) - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): if default is None: default = {} default = default.copy() - default.update({'move_history_ids2': [], 'move_history_ids': []}) - return super(stock_move, self).copy(cr, uid, id, default, context=context) + default.update({ + 'tracking_id': False, + 'prodlot_id': False, + 'move_history_ids2': [], + 'move_history_ids': [] + }) + return super(stock_move, self).copy_data(cr, uid, id, default, context=context) def _auto_init(self, cursor, context=None): res = super(stock_move, self)._auto_init(cursor, context=context) From 0ff86218f617f210495832b5145c40009f8fc3f0 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Mon, 24 Feb 2014 10:03:54 +0100 Subject: [PATCH 02/18] Use setdefault to allow a copy with one of this field with a value bzr revid: guewen.baconnier@camptocamp.com-20140224090354-wcsnd4wzs91w553e --- addons/stock/stock.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 53f43f73083..1e6291b739c 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1806,12 +1806,10 @@ class stock_move(osv.osv): if default is None: default = {} default = default.copy() - default.update({ - 'tracking_id': False, - 'prodlot_id': False, - 'move_history_ids2': [], - 'move_history_ids': [] - }) + default.setdefault('tracking_id', False) + default.setdefault('prodlot_id', False) + default.setdefault('move_history_ids', []) + default.setdefault('move_history_ids2', []) return super(stock_move, self).copy_data(cr, uid, id, default, context=context) def _auto_init(self, cursor, context=None): From 26f807fa025ca99a9d0cf4e0212d395bb726d570 Mon Sep 17 00:00:00 2001 From: Amit Dodiya Date: Tue, 25 Mar 2014 11:17:43 +0530 Subject: [PATCH 03/18] [FIX] account_voucher: forward port of 6.0 revision: 5094, for issue cancel_voucher method is unlinking the whole account_move_reconciliation record bzr revid: ado@tinyerp.com-20140325054743-opywyna9w1toyjp8 --- addons/account_voucher/account_voucher.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index f58c640b11c..86755ce17b6 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -947,19 +947,15 @@ class account_voucher(osv.osv): def cancel_voucher(self, cr, uid, ids, context=None): reconcile_pool = self.pool.get('account.move.reconcile') move_pool = self.pool.get('account.move') - + move_line_pool = self.pool.get('account.move.line') for voucher in self.browse(cr, uid, ids, context=context): - # refresh to make sure you don't unlink an already removed move - voucher.refresh() - recs = [] for line in voucher.move_ids: if line.reconcile_id: - recs += [line.reconcile_id.id] - if line.reconcile_partial_id: - recs += [line.reconcile_partial_id.id] - - reconcile_pool.unlink(cr, uid, recs) - + move_lines = [move_line.id for move_line in line.reconcile_id.line_id] + move_lines.remove(line.id) + reconcile_pool.unlink(cr, uid, [line.reconcile_id.id]) + if len(move_lines) >= 2: + move_line_pool.reconcile_partial(cr, uid, move_lines, 'auto',context=context) if voucher.move_id: move_pool.button_cancel(cr, uid, [voucher.move_id.id]) move_pool.unlink(cr, uid, [voucher.move_id.id]) From 91930b470d000b863511b841b40d42c9ce1b0c98 Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Wed, 16 Apr 2014 14:08:57 +0530 Subject: [PATCH 04/18] [FIX]Fixed the issue of reference field throws traceback that view is undefined, the reason is that reference field passing DefaultFieldManager while creating instance of many2one widget and DefaultFieldManager is eventually extending instance.web.widget not instance.web.form.FormWidget and hence DefaultFieldmanager will nto having view attribute, instead of calling self.view.do_onchange, trigger changed_value which is going to do the same job. bzr revid: msh@tinyerp.com-20140416083857-sug0k4a28nkvgg27 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index edb44e7ea06..11e2c4e6b7c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3148,7 +3148,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.display_value = {}; self.render_value(); self.focus(); - self.view.do_onchange(self); + self.trigger('changed_value'); }); }); From 64ce8f977dafa124f71fdc928046b4ca1e173991 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 17 Apr 2014 15:26:16 +0200 Subject: [PATCH 05/18] [FIX] account_analytics_plan: for bank statement move, the analytic distribution must not be written on the counterpart move line bzr revid: dle@openerp.com-20140417132616-w71ctwn0w653yn0v --- .../account_analytic_plans.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 40484298f1b..2948ac1c19c 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -466,15 +466,10 @@ class account_bank_statement(osv.osv): _inherit = "account.bank.statement" _name = "account.bank.statement" - def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None): - account_move_line_pool = self.pool.get('account.move.line') - account_bank_statement_line_pool = self.pool.get('account.bank.statement.line') - st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context=context) - result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context) - move = st_line.move_ids and st_line.move_ids[0] or False - if move: - for line in move.line_id: - account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context) + def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, context=None): + result = super(account_bank_statement,self)._prepare_bank_move_line(cr, uid, st_line, + move_id, amount, company_currency_id, context=context) + result['analytics_id'] = st_line.analytics_id.id return result def button_confirm_bank(self, cr, uid, ids, context=None): From e2b8593f9157e141e991933eb470999f049e214a Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 17 Apr 2014 18:09:19 +0200 Subject: [PATCH 06/18] [REVERT] web: 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr, break the kanban drag and drop, which is far more important than the show more button wrongly displayed in ie. bzr revid: dle@openerp.com-20140417160919-ftwk0jtci9dwuu7h --- addons/web_kanban/static/src/css/kanban.css | 5 ++++- addons/web_kanban/static/src/css/kanban.sass | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 1a0c3f1d9eb..2c2a19724cf 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -140,7 +140,10 @@ padding: 0px; background: white; } -.openerp .oe_kanban_view .oe_kanban_column { +.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards { + height: 100%; +} +.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards { height: 100%; } .openerp .oe_kanban_view .oe_kanban_aggregates { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 48457789dd2..cac86ac327b 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -161,7 +161,7 @@ padding: 0px background: #ffffff - .oe_kanban_column + .oe_kanban_column, .oe_kanban_column_cards height: 100% .oe_kanban_aggregates padding: 0 From 8364a0faaba81bdf0ef9e96414b06a2c15dcd6f6 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 18 Apr 2014 07:21:54 +0000 Subject: [PATCH 07/18] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140418072154-969nr7hzpppvd0mw --- addons/hr/i18n/ja.po | 16 ++++++++-------- addons/stock/i18n/zh_TW.po | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po index ad14389644b..5781c49dd86 100644 --- a/addons/hr/i18n/ja.po +++ b/addons/hr/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-21 03:38+0000\n" +"PO-Revision-Date: 2014-04-18 02:39+0000\n" "Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-22 07:32+0000\n" -"X-Generator: Launchpad (build 16926)\n" +"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 @@ -25,7 +25,7 @@ msgstr "OpenERPユーザ" #. module: hr #: field:hr.config.settings,module_hr_timesheet_sheet:0 msgid "Allow timesheets validation by managers" -msgstr "" +msgstr "マネジャーによるタイムシート検証" #. module: hr #: field:hr.job,requirements:0 @@ -111,7 +111,7 @@ msgstr "" #. module: hr #: help:hr.config.settings,module_hr_holidays:0 msgid "This installs the module hr_holidays." -msgstr "" +msgstr "hr_holidays モジュールをインストールします。" #. module: hr #: view:hr.job:0 @@ -126,7 +126,7 @@ msgstr "採用中" #. module: hr #: field:hr.job,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "未読メッセージ" #. module: hr #: field:hr.department,company_id:0 @@ -144,7 +144,7 @@ msgstr "採用予定" #. module: hr #: view:hr.employee:0 msgid "Other Information ..." -msgstr "" +msgstr "その他情報..." #. module: hr #: constraint:hr.employee.category:0 @@ -154,7 +154,7 @@ msgstr "" #. module: hr #: help:hr.config.settings,module_hr_recruitment:0 msgid "This installs the module hr_recruitment." -msgstr "" +msgstr "hr_recruitment モジュールをインストールします。" #. module: hr #: view:hr.employee:0 diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index 15c281d95fd..18785a58b5e 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-17 06:53+0000\n" +"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: stock From a97dd9adaf04377298fcd090d58fb144c9bfbe5c Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 18 Apr 2014 16:05:08 +0200 Subject: [PATCH 08/18] [FIX] mail: correct missing comma in domain on mail.mail bzr revid: mat@openerp.com-20140418140508-y0fnxsbgda0gp6t4 --- addons/mail/mail_mail_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml index e0d1f3e96b2..361959a9927 100644 --- a/addons/mail/mail_mail_view.xml +++ b/addons/mail/mail_mail_view.xml @@ -86,7 +86,7 @@ mail.mail - + From 1db082db9d4e58e53ccaf81016708e7479d71c2a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 18 Apr 2014 18:45:52 +0200 Subject: [PATCH 09/18] [FIX] convert: use _all_columns instead of _columns as it contain fields from inherited models. bzr revid: mat@openerp.com-20140418164552-2mlprexkdlqlui2h --- openerp/tools/convert.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 4598e2e384a..870f9d19dd2 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -772,8 +772,8 @@ form: module.record_id""" % (xml_id,) f_ref = field.get("ref",'').encode('utf-8') f_search = field.get("search",'').encode('utf-8') f_model = field.get("model",'').encode('utf-8') - if not f_model and model._columns.get(f_name,False): - f_model = model._columns[f_name]._obj + if not f_model and model._all_columns.get(f_name,False): + f_model = model._all_columns[f_name].column._obj f_use = field.get("use",'').encode('utf-8') or 'id' f_val = False @@ -785,9 +785,9 @@ form: module.record_id""" % (xml_id,) # browse the objects searched s = f_obj.browse(cr, self.uid, f_obj.search(cr, self.uid, q)) # column definitions of the "local" object - _cols = self.pool.get(rec_model)._columns + _cols = self.pool.get(rec_model)._all_columns # if the current field is many2many - if (f_name in _cols) and _cols[f_name]._type=='many2many': + if (f_name in _cols) and _cols[f_name].column._type=='many2many': f_val = [(6, 0, map(lambda x: x[f_use], s))] elif len(s): # otherwise (we are probably in a many2one field), @@ -797,17 +797,17 @@ form: module.record_id""" % (xml_id,) if f_ref=="null": f_val = False else: - if f_name in model._columns \ - and model._columns[f_name]._type == 'reference': + if f_name in model._all_columns \ + and model._all_columns[f_name].column._type == 'reference': val = self.model_id_get(cr, f_ref) f_val = val[0] + ',' + str(val[1]) else: f_val = self.id_get(cr, f_ref) else: f_val = _eval_xml(self,field, self.pool, cr, self.uid, self.idref) - if model._columns.has_key(f_name): + if f_name in model._all_columns: import openerp.osv as osv - if isinstance(model._columns[f_name], osv.fields.integer): + if isinstance(model._all_columns[f_name].column, osv.fields.integer): f_val = int(f_val) res[f_name] = f_val From 2e07433d11bc8cdc9f88a9249cb5442d0e77a9df Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sun, 20 Apr 2014 05:58:23 +0000 Subject: [PATCH 10/18] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140418072138-5fv3mmbsqnlcpk4b bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063447-v94cfwvpby4h6d0v bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055823-r61ad07jgr3110pw --- openerp/addons/base/i18n/bg.po | 116 +++++++++++++++++---------------- openerp/addons/base/i18n/de.po | 18 ++--- openerp/addons/base/i18n/hi.po | 21 +++--- 3 files changed, 81 insertions(+), 74 deletions(-) diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po index 90df2de035a..fcb2fa1fcea 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/i18n/bg.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2013-06-20 13:28+0000\n" -"Last-Translator: Georgi Uzunov \n" +"PO-Revision-Date: 2014-04-17 18:40+0000\n" +"Last-Translator: Vihren Kanev \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -627,7 +627,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_idea msgid "Ideas" -msgstr "" +msgstr "Идеи" #. module: base #: model:ir.module.module,description:base.module_event @@ -700,7 +700,7 @@ msgstr "Колумбия" #. module: base #: model:res.partner.title,name:base.res_partner_title_mister msgid "Mister" -msgstr "" +msgstr "Господин" #. module: base #: help:res.country,code:0 @@ -757,7 +757,7 @@ msgstr "Персонализираните полета трябва да има #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_mx msgid "Mexico - Accounting" -msgstr "" +msgstr "Мексико - Счетоводство" #. module: base #: help:ir.actions.server,action_id:0 @@ -872,7 +872,7 @@ msgstr "Еритрея" #. module: base #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Името на фирмата трябва да е уникално!" #. module: base #: model:ir.ui.menu,name:base.menu_base_action_rule_admin @@ -882,7 +882,7 @@ msgstr "Автоматизирани действия" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_ro msgid "Romania - Accounting" -msgstr "" +msgstr "Румъния - Счетоводство" #. module: base #: model:ir.model,name:base.model_res_config_settings @@ -927,7 +927,7 @@ msgstr "шведски / svenska" #: field:base.language.export,name:0 #: field:ir.attachment,datas_fname:0 msgid "File Name" -msgstr "" +msgstr "Име на файла" #. module: base #: model:res.country,name:base.rs @@ -1071,7 +1071,7 @@ msgstr "Ъпгрейд на модул" #: view:res.partner.bank:0 #: view:res.users:0 msgid "ZIP" -msgstr "" +msgstr "Пощенски код" #. module: base #: selection:base.language.install,lang:0 @@ -1221,6 +1221,8 @@ msgstr "TGZ Архив" msgid "" "Users added to this group are automatically added in the following groups." msgstr "" +"Потребителите добавени в тази група автоматично ще бъдат добавени и в " +"следните групи." #. module: base #: code:addons/base/ir/ir_model.py:732 @@ -1257,7 +1259,7 @@ msgstr "Вид" #. module: base #: field:ir.mail_server,smtp_user:0 msgid "Username" -msgstr "" +msgstr "Потребителско име" #. module: base #: model:ir.module.module,description:base.module_l10n_br @@ -1396,7 +1398,7 @@ msgstr "" #. module: base #: field:ir.module.category,visible:0 msgid "Visible" -msgstr "" +msgstr "Видим" #. module: base #: model:ir.actions.client,name:base.action_client_base_menu @@ -1482,7 +1484,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_web_tests msgid "Tests" -msgstr "" +msgstr "Тестове" #. module: base #: field:ir.actions.report.xml,attachment:0 @@ -1563,7 +1565,7 @@ msgstr "Отказана операция" #. module: base #: model:ir.module.module,shortdesc:base.module_document msgid "Document Management System" -msgstr "" +msgstr "Система за управление на документи" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_claim @@ -1697,7 +1699,7 @@ msgstr "Не съществува език с код \"%s\"" #: model:ir.module.category,name:base.module_category_social_network #: model:ir.module.module,shortdesc:base.module_mail msgid "Social Network" -msgstr "" +msgstr "Социална мрежа" #. module: base #: view:res.lang:0 @@ -1879,12 +1881,12 @@ msgstr "" #. module: base #: field:res.partner,image_small:0 msgid "Small-sized image" -msgstr "" +msgstr "Картинка с малък размер" #. module: base #: model:ir.module.module,shortdesc:base.module_stock msgid "Warehouse Management" -msgstr "" +msgstr "Управление на складове" #. module: base #: model:ir.model,name:base.model_res_request_link @@ -1929,7 +1931,7 @@ msgstr "Резултатно действие" #: view:ir.module.module:0 #, python-format msgid "Install" -msgstr "" +msgstr "Инсталиране" #. module: base #: field:res.currency,accuracy:0 @@ -2239,7 +2241,7 @@ msgstr "" #: model:ir.ui.menu,name:base.menu_administration #: model:res.groups,name:base.group_system msgid "Settings" -msgstr "" +msgstr "Настройки" #. module: base #: selection:ir.actions.act_window,view_type:0 @@ -2330,7 +2332,7 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_tools msgid "Extra Tools" -msgstr "" +msgstr "Допълнителни инструменти" #. module: base #: view:ir.attachment:0 @@ -2348,6 +2350,8 @@ msgid "" "Appears by default on the top right corner of your printed documents (report " "header)." msgstr "" +"По подразбиране се появява в горния десен ъгъл на принтираните документи " +"(горния колонтитул на отчетите)" #. module: base #: field:base.module.update,update:0 @@ -2357,7 +2361,7 @@ msgstr "Брой обновени модули" #. module: base #: field:ir.cron,function:0 msgid "Method" -msgstr "" +msgstr "Метод" #. module: base #: model:ir.module.module,shortdesc:base.module_auth_crypt @@ -2406,7 +2410,7 @@ msgstr "" #. module: base #: field:change.password.user,new_passwd:0 msgid "New Password" -msgstr "" +msgstr "Нова парола" #. module: base #: model:ir.actions.act_window,help:base.action_ui_view @@ -3054,7 +3058,7 @@ msgstr "" #: code:addons/base/ir/ir_fields.py:146 #, python-format msgid "yes" -msgstr "" +msgstr "да" #. module: base #: field:ir.model.fields,serialization_field_id:0 @@ -3275,7 +3279,7 @@ msgstr "" #: view:res.users:0 #, python-format msgid "Application" -msgstr "" +msgstr "Приложение" #. module: base #: model:res.groups,comment:base.group_hr_manager @@ -3604,7 +3608,7 @@ msgstr "workflow.activity" #. module: base #: view:base.language.export:0 msgid "Export Complete" -msgstr "" +msgstr "Изнасянето завърши" #. module: base #: help:ir.ui.view_sc,res_id:0 @@ -3841,7 +3845,7 @@ msgstr "" #: field:res.company,rml_footer:0 #: field:res.company,rml_footer_readonly:0 msgid "Report Footer" -msgstr "" +msgstr "Долен колонтитул на отчета" #. module: base #: selection:res.lang,direction:0 @@ -3979,7 +3983,7 @@ msgstr "" #: code:addons/orm.py:3902 #, python-format msgid "Access Denied" -msgstr "" +msgstr "Отказан достъп" #. module: base #: field:res.company,name:0 @@ -4062,7 +4066,7 @@ msgstr "" #. module: base #: model:res.country,name:base.je msgid "Jersey" -msgstr "" +msgstr "Джърси (остров)" #. module: base #: model:ir.model,name:base.model_ir_translation @@ -4127,7 +4131,7 @@ msgstr "" #. module: base #: model:res.country,name:base.sk msgid "Slovakia" -msgstr "" +msgstr "Словакия" #. module: base #: model:res.country,name:base.nr @@ -4488,7 +4492,7 @@ msgstr "Обобщение" #. module: base #: model:ir.module.category,name:base.module_category_hidden_dependency msgid "Dependency" -msgstr "" +msgstr "Зависимост" #. module: base #: model:ir.module.module,description:base.module_portal @@ -4588,7 +4592,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_knowledge msgid "Knowledge Management System" -msgstr "" +msgstr "Система за управление на ЗНАНИЯ" #. module: base #: view:workflow.activity:0 @@ -4801,7 +4805,7 @@ msgstr "Изглед" #: code:addons/base/ir/ir_fields.py:146 #, python-format msgid "no" -msgstr "" +msgstr "не" #. module: base #: model:ir.module.module,description:base.module_crm_partner_assign @@ -4883,7 +4887,7 @@ msgstr "" #. module: base #: model:res.country,name:base.ps msgid "Palestinian Territory, Occupied" -msgstr "" +msgstr "Палестинска територия, Окупирана" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_ch @@ -4988,7 +4992,7 @@ msgstr "Правила" #. module: base #: field:ir.mail_server,smtp_host:0 msgid "SMTP Server" -msgstr "" +msgstr "SMTP сървър" #. module: base #: code:addons/base/module/module.py:320 @@ -5368,7 +5372,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_recruitment msgid "Recruitment Process" -msgstr "" +msgstr "Процес на наемане" #. module: base #: model:res.country,name:base.br @@ -5822,7 +5826,7 @@ msgstr "Монсерат" #. module: base #: model:ir.module.module,shortdesc:base.module_decimal_precision msgid "Decimal Precision Configuration" -msgstr "" +msgstr "Настройки на десетична точност" #. module: base #: model:ir.model,name:base.model_ir_actions_act_url @@ -5980,7 +5984,7 @@ msgstr "" #. module: base #: view:ir.translation:0 msgid "Comments" -msgstr "" +msgstr "Коментари" #. module: base #: model:res.country,name:base.et @@ -5990,7 +5994,7 @@ msgstr "Етиопия" #. module: base #: model:ir.module.category,name:base.module_category_authentication msgid "Authentication" -msgstr "" +msgstr "Идентификация" #. module: base #: model:res.country,name:base.gd @@ -6059,7 +6063,7 @@ msgstr "Свойство при изтриване на полета много- #. module: base #: model:ir.module.category,name:base.module_category_accounting_and_finance msgid "Accounting & Finance" -msgstr "" +msgstr "Счетоводство и финанси" #. module: base #: field:ir.actions.server,write_id:0 @@ -6211,7 +6215,7 @@ msgstr "Името на група не може да започва с \"-\"" #: view:ir.module.module:0 #: model:ir.ui.menu,name:base.module_mi msgid "Apps" -msgstr "" +msgstr "Приложения" #. module: base #: view:ir.ui.view_sc:0 @@ -6264,7 +6268,7 @@ msgstr "" #. module: base #: view:res.partner:0 msgid "Phone:" -msgstr "" +msgstr "Телефон:" #. module: base #: field:res.partner,is_company:0 @@ -6976,7 +6980,7 @@ msgstr "" #. module: base #: field:res.users,id:0 msgid "ID" -msgstr "" +msgstr "ID" #. module: base #: field:ir.cron,doall:0 @@ -6997,7 +7001,7 @@ msgstr "Свързване на обекти" #: field:ir.module.category,xml_id:0 #: field:ir.ui.view,xml_id:0 msgid "External ID" -msgstr "" +msgstr "Външен ID" #. module: base #: help:res.currency.rate,rate:0 @@ -7440,7 +7444,7 @@ msgstr "Върху множество документи" #: view:res.users:0 #: view:wizard.ir.model.menu.create:0 msgid "or" -msgstr "" +msgstr "или" #. module: base #: model:ir.module.module,shortdesc:base.module_account_accountant @@ -7450,7 +7454,7 @@ msgstr "" #. module: base #: view:ir.module.module:0 msgid "Upgrade" -msgstr "" +msgstr "Надгради" #. module: base #: model:ir.module.module,description:base.module_base_action_rule @@ -7488,7 +7492,7 @@ msgstr "Фарьорски острови" #. module: base #: field:ir.mail_server,smtp_encryption:0 msgid "Connection Security" -msgstr "" +msgstr "Сигурност на връзката" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_ec @@ -7590,7 +7594,7 @@ msgstr "" #. module: base #: model:res.partner.category,name:base.res_partner_category_14 msgid "Manufacturer" -msgstr "" +msgstr "Производител" #. module: base #: help:res.users,company_id:0 @@ -7894,7 +7898,7 @@ msgstr "" #. module: base #: view:ir.mail_server:0 msgid "Test Connection" -msgstr "" +msgstr "Тестване на връзка" #. module: base #: model:res.country,name:base.mm @@ -8433,7 +8437,7 @@ msgstr "ir.ui.menu" #. module: base #: model:ir.module.module,shortdesc:base.module_project msgid "Project Management" -msgstr "" +msgstr "Управление на проекти" #. module: base #: view:ir.module.module:0 @@ -9158,7 +9162,7 @@ msgstr "" #. module: base #: field:res.partner.title,shortcut:0 msgid "Abbreviation" -msgstr "" +msgstr "Абревиатура" #. module: base #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main @@ -9402,7 +9406,7 @@ msgstr "Справка" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_prof msgid "Prof." -msgstr "" +msgstr "Проф." #. module: base #: code:addons/base/ir/ir_mail_server.py:241 @@ -9430,7 +9434,7 @@ msgstr "Уеб-страница" #. module: base #: selection:ir.mail_server,smtp_encryption:0 msgid "None" -msgstr "" +msgstr "Няма" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_holidays @@ -10492,7 +10496,7 @@ msgstr "" #: view:res.partner:0 #: view:res.users:0 msgid "Street..." -msgstr "" +msgstr "Улица" #. module: base #: constraint:res.users:0 @@ -10517,7 +10521,7 @@ msgstr "Питкерн" #. module: base #: field:res.partner,category_id:0 msgid "Tags" -msgstr "" +msgstr "Етикети" #. module: base #: view:base.module.upgrade:0 @@ -15599,7 +15603,7 @@ msgstr "Съдържание" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_mrp msgid "Sales and MRP Management" -msgstr "" +msgstr "Продажби и MRP управление" #. module: base #: model:ir.actions.act_window,help:base.action_partner_form diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index 3aa1bd14699..91cc6e9175f 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2014-02-02 18:57+0000\n" -"Last-Translator: Ralf Hilgenstock \n" +"PO-Revision-Date: 2014-04-19 16:21+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-20 05:58+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -8847,7 +8847,7 @@ msgstr "" #. module: base #: field:ir.ui.menu,needaction_enabled:0 msgid "Target model uses the need action mechanism" -msgstr "" +msgstr "Ziel-Modell nutzt den need_action Mechanismus" #. module: base #: help:ir.model.fields,relation:0 @@ -17627,7 +17627,7 @@ msgstr "Helpdesk" #. module: base #: field:ir.rule,perm_write:0 msgid "Apply for Write" -msgstr "" +msgstr "Zum Schreiben anwenden" #. module: base #: field:ir.ui.menu,parent_left:0 @@ -19100,7 +19100,7 @@ msgstr "Funktion" #. module: base #: field:ir.ui.menu,parent_right:0 msgid "Parent Right" -msgstr "" +msgstr "Oberkonto Rechts" #. module: base #: model:ir.module.category,description:base.module_category_customer_relationship_management @@ -19175,7 +19175,7 @@ msgstr "Bedarfsmeldungen" #. module: base #: selection:ir.actions.act_window,target:0 msgid "Inline Edit" -msgstr "" +msgstr "Eingebettet Bearbeiten" #. module: base #: selection:ir.cron,interval_type:0 @@ -19278,7 +19278,7 @@ msgstr "Exportbezeichnung" #: code:addons/base/ir/ir_sequence.py:259 #, python-format msgid "Invalid prefix or suffix for sequence '%s'" -msgstr "" +msgstr "Ungültiges Prä- oder Suffix für die Folge '%s'" #. module: base #: help:res.partner,type:0 diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po index 10cd09c93b8..cb0c9f9b047 100644 --- a/openerp/addons/base/i18n/hi.po +++ b/openerp/addons/base/i18n/hi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2012-12-21 23:09+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-04-18 14:24+0000\n" +"Last-Translator: Harshraj Nanotiya \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-12 09:30+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:34+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -25,6 +25,9 @@ msgid "" "================================================\n" " " msgstr "" +"\n" +"धनादेश लेखन और मुद्रण मापांक.\n" +" " #. module: base #: view:res.partner.bank:0 @@ -39,12 +42,12 @@ msgstr "सैंट हेलेना" #. module: base #: view:ir.actions.report.xml:0 msgid "Other Configuration" -msgstr "" +msgstr "इतर समाकृति" #. module: base #: selection:ir.property,type:0 msgid "DateTime" -msgstr "वेड" +msgstr "तारीखवक़्त" #. module: base #: code:addons/fields.py:652 @@ -58,17 +61,17 @@ msgstr "" #: field:ir.ui.view,arch:0 #: field:ir.ui.view.custom,arch:0 msgid "View Architecture" -msgstr "" +msgstr "आर्किटेक्चर" #. module: base #: model:ir.module.module,summary:base.module_sale_stock msgid "Quotation, Sale Orders, Delivery & Invoicing Control" -msgstr "" +msgstr "उद्धरण, बिक्री आदेश, वितरण और चालान नियंत्रण" #. module: base #: selection:ir.sequence,implementation:0 msgid "No gap" -msgstr "" +msgstr "कोई अंतर नहीं" #. module: base #: selection:base.language.install,lang:0 From 1ddeaa57a664d17a9579a56b37cc69ca4c8f285f Mon Sep 17 00:00:00 2001 From: Anael Closson Date: Tue, 22 Apr 2014 09:38:26 +0200 Subject: [PATCH 11/18] [FIX] en_US typos - opw 606933 bzr revid: acl@openerp.com-20140422073826-0w9ne38ub8nh7p4v --- addons/stock/wizard/stock_location_product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py index 59d99167e6a..0c0f58f13f8 100644 --- a/addons/stock/wizard/stock_location_product.py +++ b/addons/stock/wizard/stock_location_product.py @@ -28,8 +28,8 @@ class stock_location_product(osv.osv_memory): _columns = { 'from_date': fields.datetime('From'), 'to_date': fields.datetime('To'), - 'type': fields.selection([('inventory','Analyse Current Inventory'), - ('period','Analyse a Period')], 'Analyse Type', required=True), + 'type': fields.selection([('inventory','Analyze current inventory'), + ('period','Analyze period')], 'Analysis Type', required=True), } def action_open_window(self, cr, uid, ids, context=None): From 89fd1bede48e5ee52c0d91f927b644a498cea8ab Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 22 Apr 2014 08:24:59 +0000 Subject: [PATCH 12/18] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9 bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p --- addons/account/i18n/ja.po | 44 +-- addons/account/i18n/nl.po | 22 +- addons/account/i18n/pl.po | 45 +-- addons/account_analytic_analysis/i18n/pl.po | 14 +- addons/account_followup/i18n/pl.po | 40 +-- addons/account_payment/i18n/de.po | 22 +- addons/account_payment/i18n/nl.po | 8 +- addons/account_voucher/i18n/ja.po | 12 +- addons/auth_signup/i18n/ja.po | 320 ++++++++++++++++++++ addons/hr/i18n/ja.po | 2 +- addons/hr_timesheet_sheet/i18n/pl.po | 10 +- addons/mail/i18n/pl.po | 12 +- addons/membership/i18n/pl.po | 12 +- addons/point_of_sale/i18n/ro.po | 14 +- addons/product/i18n/pl.po | 22 +- 15 files changed, 473 insertions(+), 126 deletions(-) create mode 100644 addons/auth_signup/i18n/ja.po diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 65df1d84819..7772ebb6db6 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-04-01 02:55+0000\n" -"Last-Translator: hiro TAKADA \n" +"PO-Revision-Date: 2014-04-21 15:10+0000\n" +"Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -687,7 +687,7 @@ msgstr "主となる順序は現在と異なる必要があります。" #: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not configured properly." -msgstr "" +msgstr "現在通貨が正しく設定されていません。" #. module: account #: field:account.journal,profit_account_id:0 @@ -739,6 +739,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " "and 'draft' or ''}" msgstr "" +"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " +"and 'draft' or ''}" #. module: account #: view:account.period:0 @@ -1681,7 +1683,7 @@ msgstr "" #. module: account #: view:account.config.settings:0 msgid "eInvoicing & Payments" -msgstr "請求と支払い" +msgstr "請求と支払" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 @@ -2897,7 +2899,7 @@ msgstr "分析勘定" #: field:account.config.settings,default_purchase_tax:0 #: field:account.config.settings,purchase_tax:0 msgid "Default purchase tax" -msgstr "デフォルト消費税（購入）" +msgstr "デフォルト購買税" #. module: account #: view:account.account:0 @@ -2910,7 +2912,7 @@ msgstr "デフォルト消費税（購入）" #: model:ir.ui.menu,name:account.menu_action_account_form #: model:ir.ui.menu,name:account.menu_analytic msgid "Accounts" -msgstr "アカウント" +msgstr "勘定科目" #. module: account #: code:addons/account/account.py:3541 @@ -2982,7 +2984,7 @@ msgstr "参照" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Purchase Tax" -msgstr "" +msgstr "購買税" #. module: account #: help:account.move.line,tax_code_id:0 @@ -3278,7 +3280,7 @@ msgstr "基本コードの金額" #. module: account #: field:wizard.multi.charts.accounts,sale_tax:0 msgid "Default Sale Tax" -msgstr "デフォルト消費税（売上）" +msgstr "デフォルト販売税" #. module: account #: help:account.model.line,date_maturity:0 @@ -3364,7 +3366,7 @@ msgstr "会計年度の選択" #: view:account.config.settings:0 #: view:account.installer:0 msgid "Date Range" -msgstr "" +msgstr "日付範囲" #. module: account #: view:account.period:0 @@ -3450,7 +3452,7 @@ msgstr "合計数量" #. module: account #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0 msgid "Write-Off account" -msgstr "償却アカウント" +msgstr "償却勘定" #. module: account #: field:account.model.line,model_id:0 @@ -4026,7 +4028,7 @@ msgstr "詳細" #. module: account #: help:account.config.settings,default_purchase_tax:0 msgid "This purchase tax will be assigned by default on new products." -msgstr "購入税はデフォルトで新製品に割り当てられます。" +msgstr "購買税はデフォルトで新製品に割り当てられます。" #. module: account #: report:account.account.balance:0 @@ -5046,7 +5048,7 @@ msgstr "会社の通貨と異なる場合はレポートに通貨欄を追加し #: code:addons/account/account.py:3394 #, python-format msgid "Purchase Tax %.2f%%" -msgstr "消費税（仕入） %.2f%%" +msgstr "購買税 %.2f%%" #. module: account #: view:account.subscription.generate:0 @@ -5090,7 +5092,7 @@ msgstr "新規" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Sale Tax" -msgstr "" +msgstr "販売税" #. module: account #: view:account.move:0 @@ -6381,7 +6383,7 @@ msgstr "日数" msgid "" "You cannot validate this journal entry because account \"%s\" does not " "belong to chart of accounts \"%s\"." -msgstr "" +msgstr "勘定科目「%s」は勘定科目表「%s」に含まれないため、この仕訳を確定できません。" #. module: account #: view:account.financial.report:0 @@ -7671,7 +7673,7 @@ msgstr "請求年によるグループ" #. module: account #: field:account.config.settings,purchase_tax_rate:0 msgid "Purchase tax (%)" -msgstr "" +msgstr "購買税(%)" #. module: account #: help:res.partner,credit:0 @@ -7725,7 +7727,7 @@ msgstr "銀行取引明細書行" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" -msgstr "デフォルト消費税（仕入）" +msgstr "デフォルト購買税" #. module: account #: field:account.chart.template,property_account_income_opening:0 @@ -9411,7 +9413,7 @@ msgstr "会計データ設定" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax_rate:0 msgid "Purchase Tax(%)" -msgstr "消費税（仕入）（%）" +msgstr "購買税(%)" #. module: account #: code:addons/account/account_invoice.py:901 @@ -9797,7 +9799,7 @@ msgstr "一般的なレポート" #: field:account.config.settings,default_sale_tax:0 #: field:account.config.settings,sale_tax:0 msgid "Default sale tax" -msgstr "デフォルト消費税（販売）" +msgstr "デフォルト販売税" #. module: account #: report:account.overdue:0 @@ -10047,7 +10049,7 @@ msgstr "分析勘定より" #. module: account #: view:account.installer:0 msgid "Configure your Fiscal Year" -msgstr "" +msgstr "会計年度設定" #. module: account #: field:account.period,name:0 diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index 2ef093ec17e..089d94953d5 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-04-05 08:09+0000\n" +"PO-Revision-Date: 2014-04-20 06:40+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-06 06:52+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -1418,7 +1418,7 @@ msgstr "Vervangende belasting" #. module: account #: selection:account.move.line,centralisation:0 msgid "Credit Centralisation" -msgstr "Credit centralisatie" +msgstr "Totaal credit" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form @@ -2943,7 +2943,7 @@ msgstr "Grondslag teken (+/-)" #. module: account #: selection:account.move.line,centralisation:0 msgid "Debit Centralisation" -msgstr "Verzameld debet" +msgstr "Totaal debet" #. module: account #: view:account.invoice.confirm:0 @@ -3359,8 +3359,8 @@ msgid "" "You need an Opening journal with centralisation checked to set the initial " "balance." msgstr "" -"U dient een peningsbalans opgeven in een openingsdagboek met de instelling " -"'gecentraliseerde tegenboeking'." +"U dient een openingsbalans opgeven in een openingsdagboek met de instelling " +"'Centrale tegenrekening'." #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_list @@ -6298,7 +6298,7 @@ msgstr "Vul dit formulier in als u geld in de kassa stopt." #: view:account.payment.term.line:0 #: field:account.payment.term.line,value_amount:0 msgid "Amount To Pay" -msgstr "Te betalen bedrag" +msgstr "Bedrag te betalen" #. module: account #: help:account.partner.reconcile.process,to_reconcile:0 @@ -7440,7 +7440,7 @@ msgstr "Boekingsregels" #. module: account #: field:account.move.line,centralisation:0 msgid "Centralisation" -msgstr "Centralisatie" +msgstr "Balansboekingen" #. module: account #: view:account.account:0 @@ -9775,7 +9775,7 @@ msgstr "" #: code:addons/account/account_move_line.py:1006 #, python-format msgid "The account move (%s) for centralisation has been confirmed." -msgstr "De boeking (%s) voor voor centralisatie is bevestigd." +msgstr "De balansboeking (%s) is bevestigd." #. module: account #: report:account.analytic.account.journal:0 @@ -10581,7 +10581,7 @@ msgstr "Directe betaling" #: code:addons/account/account.py:1502 #, python-format msgid " Centralisation" -msgstr " Centralisatie" +msgstr " Balansboeking" #. module: account #: help:account.journal,type:0 diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index f6783ec7741..147799acd44 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-04-12 14:24+0000\n" -"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n" +"PO-Revision-Date: 2014-04-18 13:02+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -190,6 +190,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"Kliknij aby utworzyć okres rozliczeniowy.\n" +"

\n" +"Typowo, rozliczeniowym okresem księgowym jest miesiąc lub kwartał.\n" +"On odpowiada okresom rozliczeń podatkowych.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -745,6 +752,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " "and 'draft' or ''}" msgstr "" +"Faktura_${(object.number or '').replace('/','_')}_${object.state == 'draft' " +"and 'draft' or ''}" #. module: account #: view:account.period:0 @@ -999,7 +1008,7 @@ msgstr "Wrzesień" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 #, python-format msgid "Latest Manual Reconciliation Processed:" -msgstr "" +msgstr "Ostatnio ręcznie uzgodniono:" #. module: account #: selection:account.subscription,period_type:0 @@ -1802,7 +1811,7 @@ msgstr "Powtarzanie" #. module: account #: report:account.invoice:0 msgid "TIN :" -msgstr "" +msgstr "NIP:" #. module: account #: field:account.journal,groups_id:0 @@ -1844,7 +1853,7 @@ msgstr "Konto podatku dla korekt" #. module: account #: model:ir.model,name:account.model_ir_sequence msgid "ir.sequence" -msgstr "" +msgstr "ir.sequence" #. module: account #: view:account.bank.statement:0 @@ -2402,7 +2411,7 @@ msgstr "Dobra robota!" #. module: account #: field:account.config.settings,module_account_asset:0 msgid "Assets management" -msgstr "Środku trwałe" +msgstr "Środki trwałe" #. module: account #: view:account.account:0 @@ -7636,7 +7645,7 @@ msgstr "" #. module: account #: field:account.invoice,paypal_url:0 msgid "Paypal Url" -msgstr "" +msgstr "Paypal Url" #. module: account #: field:account.config.settings,module_account_voucher:0 @@ -7671,7 +7680,7 @@ msgstr "Podatki stosowane w sprzedaży" #. module: account #: view:account.period:0 msgid "Re-Open Period" -msgstr "" +msgstr "Otwórz okres ponownie" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 @@ -8423,7 +8432,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_cash_box_in msgid "cash.box.in" -msgstr "" +msgstr "cash.box.in" #. module: account #: help:account.invoice,move_id:0 @@ -8433,7 +8442,7 @@ msgstr "Połącz z automatycznie generowanymi pozycjami zapisów" #. module: account #: model:ir.model,name:account.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: account #: selection:account.config.settings,period:0 @@ -8493,6 +8502,8 @@ msgid "" "You cannot delete an invoice which is not draft or cancelled. You should " "refund it instead." msgstr "" +"Nie możńa usunąć faktury, która nie jest w stanie projektu lub anulownia. " +"Możesz tylko utowrzyć jej korektę." #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement @@ -8756,7 +8767,7 @@ msgstr "Brak roku podatkowego dla firmy" #. module: account #: view:account.invoice:0 msgid "Proforma" -msgstr "" +msgstr "Proforma" #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -9024,7 +9035,7 @@ msgstr "Typy kont" #. module: account #: model:email.template,subject:account.email_template_edi_invoice msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})" -msgstr "" +msgstr "${object.company_id.name} Faktura (Odn. ${object.number or 'n/a'})" #. module: account #: code:addons/account/account_move_line.py:1210 @@ -10241,7 +10252,7 @@ msgstr "" #: code:addons/account/account_move_line.py:780 #, python-format msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!" -msgstr "" +msgstr "Pozycja dziennika '%s' (id: %s), Zapis '%s' jest już uzgodniony!" #. module: account #: view:account.invoice:0 @@ -10255,7 +10266,7 @@ msgstr "Projekty faktur" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 #, python-format msgid "Nothing more to reconcile" -msgstr "" +msgstr "Nie ma nic więcej do uzgadniania" #. module: account #: view:cash.box.in:0 @@ -10515,7 +10526,7 @@ msgstr "Kurs waluty" #. module: account #: view:account.config.settings:0 msgid "e.g. sales@openerp.com" -msgstr "" +msgstr "np. sales@openerp.com" #. module: account #: field:account.account,tax_ids:0 diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po index 2e3b31e0f46..7f07538092d 100644 --- a/addons/account_analytic_analysis/i18n/pl.po +++ b/addons/account_analytic_analysis/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-04-12 14:29+0000\n" -"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n" +"PO-Revision-Date: 2014-04-18 12:47+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -244,6 +244,8 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -299,6 +301,8 @@ msgid "" "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " "('invoice_on_timesheets', '=', True)]}" msgstr "" +"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " +"('invoice_on_timesheets', '=', True)]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -748,7 +752,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po index 10c22770c1b..957ecfad6d5 100644 --- a/addons/account_followup/i18n/pl.po +++ b/addons/account_followup/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-11-17 11:10+0000\n" -"Last-Translator: Mirosław Bojanowicz \n" +"PO-Revision-Date: 2014-04-18 13:10+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account_followup #: model:email.template,subject:account_followup.email_template_account_followup_default @@ -258,7 +258,7 @@ msgstr "Kontrahent" #. module: account_followup #: field:account_followup.print,email_body:0 msgid "Email Body" -msgstr "" +msgstr "Treść email" #. module: account_followup #: view:account_followup.followup:0 @@ -427,7 +427,7 @@ msgstr "" #. module: account_followup #: field:account_followup.followup.line,delay:0 msgid "Due Days" -msgstr "" +msgstr "Dni zwłoki" #. module: account_followup #: field:account.move.line,followup_line_id:0 @@ -443,7 +443,7 @@ msgstr "Ostatni monit o płatność" #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup msgid "Reconcile Invoices & Payments" -msgstr "" +msgstr "Uzgadnianie Faktur i Płatności" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_s @@ -453,7 +453,7 @@ msgstr "Wykonaj manualnie monit o płatność" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Li." -msgstr "" +msgstr "Sp." #. module: account_followup #: field:account_followup.print,email_conf:0 @@ -528,6 +528,7 @@ msgstr "Monitowanie płatności" #, python-format msgid "Email not sent because of email address of partner not filled in" msgstr "" +"Email nie został wysłany ponieważ adres email partnera nie został wypełniony" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup @@ -540,11 +541,13 @@ msgid "" "Optionally you can assign a user to this field, which will make him " "responsible for the action." msgstr "" +"Opcjonalnie możesz przypisać użytkownika do tego pola, który stanie się " +"odpowiedzialny za tę akcję." #. module: account_followup #: view:res.partner:0 msgid "Partners with Overdue Credits" -msgstr "" +msgstr "Partnerzy z przeterminowanymi płatnościami" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_sending_results @@ -562,7 +565,7 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:172 #, python-format msgid " manual action(s) assigned:" -msgstr "" +msgstr " ręczna akcja przypisana do:" #. module: account_followup #: view:res.partner:0 @@ -589,13 +592,13 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Account Move line" -msgstr "" +msgstr "Pozycja zapisu" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:237 #, python-format msgid "Send Letters and Emails: Actions Summary" -msgstr "" +msgstr "Listy i Email: Podsumowanie akcji" #. module: account_followup #: view:account_followup.print:0 @@ -625,7 +628,7 @@ msgstr "Analiza monitów o płatność" #. module: account_followup #: view:res.partner:0 msgid "Action to be taken e.g. Give a phonecall, Check if it's paid, ..." -msgstr "" +msgstr "Akcja do podjęcia np. zadzwoń, sprawdź czy zapłacono, ..." #. module: account_followup #: help:res.partner,payment_next_action_date:0 @@ -828,7 +831,7 @@ msgstr "Kwota przeterminowana" #: code:addons/account_followup/account_followup.py:263 #, python-format msgid "Lit." -msgstr "" +msgstr "Sp." #. module: account_followup #: help:res.partner,latest_followup_level_id_without_lit:0 @@ -968,7 +971,7 @@ msgstr "Maksymalny poziom monitu" #: code:addons/account_followup/wizard/account_followup_print.py:171 #, python-format msgid " had unknown email address(es)" -msgstr "" +msgstr " posiada nieznany adres email" #. module: account_followup #: help:account_followup.print,test_print:0 @@ -1003,7 +1006,7 @@ msgstr "Działanie monitowania płatności" #. module: account_followup #: view:account_followup.stat:0 msgid "Including journal entries marked as a litigation" -msgstr "" +msgstr "Załącz pozycje dziennika oznaczone jako sporne" #. module: account_followup #: report:account_followup.followup.print:0 @@ -1051,7 +1054,7 @@ msgstr "Zapisy partnera" #. module: account_followup #: view:account_followup.followup.line:0 msgid "e.g. Call the customer, check if it's paid, ..." -msgstr "" +msgstr "np. Zadzwoń do klienta, sprawdż czy zapłacono, ..." #. module: account_followup #: view:account_followup.stat:0 @@ -1250,3 +1253,6 @@ msgstr "" #: field:res.partner,payment_note:0 msgid "Customer Payment Promise" msgstr "Obietnica płatności klienta" + +#~ msgid "Responsible" +#~ msgstr "Odpowiedzialny" diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po index f0261cd72b9..03864ac637d 100644 --- a/addons/account_payment/i18n/de.po +++ b/addons/account_payment/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-04-05 21:42+0000\n" -"Last-Translator: Ralf Hilgenstock \n" +"PO-Revision-Date: 2014-04-21 16:47+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account_payment #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree @@ -87,13 +87,13 @@ msgstr "Rechnungswesen / Zahlungen" #. module: account_payment #: selection:payment.line,state:0 msgid "Free" -msgstr "Frei" +msgstr "Kostenlos" #. module: account_payment #: view:payment.order.create:0 #: field:payment.order.create,entries:0 msgid "Entries" -msgstr "Buchungen nach Journal" +msgstr "Buchungen" #. module: account_payment #: report:payment.order:0 @@ -149,7 +149,7 @@ msgstr "Gesamt (in eigener Währung)" #. module: account_payment #: selection:payment.order,state:0 msgid "Cancelled" -msgstr "Abgebrochen" +msgstr "Storniert" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new @@ -295,7 +295,7 @@ msgstr "Konto Zahlungsempfänger" #. module: account_payment #: view:payment.order:0 msgid "Search Payment Orders" -msgstr "Zahlungsaufträge suchen" +msgstr "Zahlungsanweisungen durchsuchen" #. module: account_payment #: field:payment.line,create_date:0 @@ -516,7 +516,7 @@ msgstr "Ihre Referenz" #. module: account_payment #: view:payment.order:0 msgid "Payment order" -msgstr "Zahlungsvorschlag" +msgstr "Zahlungsanweisung" #. module: account_payment #: view:payment.line:0 @@ -563,7 +563,7 @@ msgstr "Information" #: model:ir.model,name:account_payment.model_payment_order #: view:payment.order:0 msgid "Payment Order" -msgstr "Zahlungsvorschlag" +msgstr "Zahlungsanweisung" #. module: account_payment #: help:payment.line,amount:0 @@ -627,7 +627,7 @@ msgstr "Zahlungsverkehr" #. module: account_payment #: report:payment.order:0 msgid "Payment Order / Payment" -msgstr "Zahlungsvorschlag" +msgstr "Zahlungsanweisung / Zahlung" #. module: account_payment #: field:payment.line,move_line_id:0 diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po index 199a14c102a..083779d3e7b 100644 --- a/addons/account_payment/i18n/nl.po +++ b/addons/account_payment/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-04-14 14:22+0000\n" +"PO-Revision-Date: 2014-04-18 08:49+0000\n" "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-15 07:51+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account_payment #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree @@ -483,7 +483,7 @@ msgstr "Betaling vullen" #. module: account_payment #: field:account.move.line,amount_to_pay:0 msgid "Amount to pay" -msgstr "Te betalen bedrag" +msgstr "Bedrag te betalen" #. module: account_payment #: field:payment.line,amount:0 diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po index 858cefd2703..3ae8d14aeb6 100644 --- a/addons/account_voucher/i18n/ja.po +++ b/addons/account_voucher/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-02 13:38+0000\n" -"Last-Translator: hiro TAKADA \n" +"PO-Revision-Date: 2014-04-21 13:29+0000\n" +"Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-03 05:55+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -615,7 +615,7 @@ msgstr "" #: field:account.config.settings,expense_currency_exchange_account_id:0 #: field:res.company,expense_currency_exchange_account_id:0 msgid "Loss Exchange Rate Account" -msgstr "" +msgstr "為替差損勘定" #. module: account_voucher #: view:account.voucher:0 @@ -1203,7 +1203,7 @@ msgstr "年" #: field:account.config.settings,income_currency_exchange_account_id:0 #: field:res.company,income_currency_exchange_account_id:0 msgid "Gain Exchange Rate Account" -msgstr "" +msgstr "為替差益勘定" #. module: account_voucher #: selection:account.voucher,type:0 diff --git a/addons/auth_signup/i18n/ja.po b/addons/auth_signup/i18n/ja.po new file mode 100644 index 00000000000..fdf7fa20969 --- /dev/null +++ b/addons/auth_signup/i18n/ja.po @@ -0,0 +1,320 @@ +# Japanese translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2014-04-21 11:33+0000\n" +"Last-Translator: Yoshi Tashiro \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: auth_signup +#: view:res.users:0 +msgid "" +"A password reset has been requested for this user. An email containing the " +"following link has been sent:" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_type:0 +msgid "Signup Token Type" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_uninvited:0 +msgid "Allow external users to sign up" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19 +#, python-format +msgid "Confirm Password" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an invitation email" +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Activated" +msgstr "有効" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_base_config_settings +msgid "base.config.settings" +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:266 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27 +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31 +#, python-format +msgid "Reset password" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_template_user_id:0 +msgid "Template user for new users created through signup" +msgstr "" + +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send reset password link by email" +msgstr "パスワードリセットのリンクをEメール送信" + +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

A password reset was requested for the OpenERP account linked to this " +"email.

\n" +"\n" +"

You may change your password by following this link.

\n" +"\n" +"

Note: If you do not expect this, you can safely ignore this email.

" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "" +"An invitation email containing the following subscription link has been sent:" +msgstr "" + +#. module: auth_signup +#: field:res.users,state:0 +msgid "Status" +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Never Connected" +msgstr "接続履歴なし" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_users +msgid "Users" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_url:0 +msgid "Signup URL" +msgstr "" + +#. module: auth_signup +#: model:email.template,body_html:auth_signup.set_password_email +msgid "" +"\n" +" \n" +"

\n" +" ${object.name},\n" +"

\n" +"

\n" +" You have been invited to connect to " +"\"${object.company_id.name}\" in order to get access to your documents in " +"OpenERP.\n" +"

\n" +"

\n" +" To accept the invitation, click on the following " +"link:\n" +"

\n" +" \n" +"

\n" +" Thanks,\n" +"

\n" +" 
\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"
\n" +" \n" +" " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:270 +#, python-format +msgid "" +"Cannot send email: no outgoing email server configured.\n" +"You can configure it under Settings/General Settings." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:177 +#, python-format +msgid "An email has been sent with credentials to reset your password" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 +#, python-format +msgid "Username" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 +#, python-format +msgid "Name" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:173 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 +#, python-format +msgid "Username (Email)" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_expiration:0 +msgid "Signup Expiration" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Log in" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_valid:0 +msgid "Signup Token is Valid" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:170 +#: code:addons/auth_signup/static/src/js/auth_signup.js:173 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:97 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:170 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "" + +#. module: auth_signup +#: model:email.template,subject:auth_signup.set_password_email +msgid "${object.company_id.name} invitation to connect on OpenERP" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30 +#, python-format +msgid "Back to Login" +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_partner +msgid "Partner" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_token:0 +msgid "Signup Token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26 +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29 +#, python-format +msgid "Sign Up" +msgstr "" diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po index 5781c49dd86..37d18af6be5 100644 --- a/addons/hr/i18n/ja.po +++ b/addons/hr/i18n/ja.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" "X-Generator: Launchpad (build 16985)\n" #. module: hr diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po index 9af163bda08..3959ab40670 100644 --- a/addons/hr_timesheet_sheet/i18n/pl.po +++ b/addons/hr_timesheet_sheet/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-04-18 12:28+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 @@ -750,7 +750,7 @@ msgstr "Zakres kart" #. module: hr_timesheet_sheet #: view:board.board:0 msgid "My Total Attendance By Week" -msgstr "Moja suma ibecności wg tygodni" +msgstr "Moja suma obecności wg tygodni" #. module: hr_timesheet_sheet #: selection:hr.timesheet.report,month:0 diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po index 362f48772e4..bf48cf3d199 100644 --- a/addons/mail/i18n/pl.po +++ b/addons/mail/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-22 18:50+0000\n" -"Last-Translator: Dariusz Żbikowski \n" +"PO-Revision-Date: 2014-04-18 12:38+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-23 07:45+0000\n" -"X-Generator: Launchpad (build 16926)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: mail #: view:mail.followers:0 @@ -1510,7 +1510,7 @@ msgstr "Wiadomość Rich-text/HTML" #. module: mail #: view:mail.mail:0 msgid "Creation Month" -msgstr "Miesiąc tworzenia" +msgstr "Miesiąc utworzenia" #. module: mail #: help:mail.compose.message,notified_partner_ids:0 @@ -1661,7 +1661,7 @@ msgstr "" #: code:addons/mail/static/src/xml/mail.xml:213 #, python-format msgid "Please, wait while the file is uploading." -msgstr "" +msgstr "Poczekaj, aż plik zostanie załadowany." #. module: mail #: view:mail.group:0 diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po index 536a8c38ec1..178420d3139 100644 --- a/addons/membership/i18n/pl.po +++ b/addons/membership/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-04-18 12:45+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: membership #: model:process.transition,name:membership.process_transition_invoicetoassociate0 @@ -160,7 +160,7 @@ msgstr "" #. module: membership #: model:process.transition,name:membership.process_transition_producttomember0 msgid "Product to member" -msgstr "" +msgstr "Produkt członka" #. module: membership #: model:product.template,name:membership.membership_1_product_template @@ -233,7 +233,7 @@ msgstr "Od" #. module: membership #: constraint:membership.membership_line:0 msgid "Error, this membership product is out of date" -msgstr "" +msgstr "Błąd! Produkt tego członka jest przeterminowany" #. module: membership #: model:process.transition.action,name:membership.process_transition_action_create0 diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po index 9917f819e03..5d53a0f19a3 100644 --- a/addons/point_of_sale/i18n/ro.po +++ b/addons/point_of_sale/i18n/ro.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-01-24 20:34+0000\n" -"Last-Translator: Dorin \n" +"PO-Revision-Date: 2014-04-20 07:24+0000\n" +"Last-Translator: Simonel Criste \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-25 06:39+0000\n" -"X-Generator: Launchpad (build 16914)\n" +"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: point_of_sale #: field:report.transaction.pos,product_nb:0 @@ -412,6 +412,8 @@ msgid "" "You cannot change the partner of a POS order for which an invoice has " "already been issued." msgstr "" +"Nu se poate schimba partenerul pe un bon de POS pentru care a fost deja " +"emisa o factură." #. module: point_of_sale #: view:pos.session.opening:0 @@ -473,7 +475,7 @@ msgstr "Cant. totala" #: code:addons/point_of_sale/static/src/js/screens.js:874 #, python-format msgid "Back" -msgstr "" +msgstr "Înapoi" #. module: point_of_sale #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template @@ -536,7 +538,7 @@ msgstr "Validati & Deschideti Sesiunea" #: selection:pos.session.opening,pos_state:0 #, python-format msgid "In Progress" -msgstr "In curs de desfasurare" +msgstr "În desfasurare" #. module: point_of_sale #: view:pos.session:0 diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po index a4f00056046..38d605566d2 100644 --- a/addons/product/i18n/pl.po +++ b/addons/product/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-09-25 11:56+0000\n" -"Last-Translator: Judyta Kazmierczak \n" +"PO-Revision-Date: 2014-04-18 12:42+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:27+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: product #: field:product.packaging,rows:0 @@ -25,7 +25,7 @@ msgstr "Liczba warstw" #. module: product #: view:res.partner:0 msgid "the parent company" -msgstr "" +msgstr "Firma nadrzędna" #. module: product #: help:product.pricelist.item,base:0 @@ -216,7 +216,7 @@ msgstr "Kategoria nadrzędna" #. module: product #: model:product.template,description:product.product_product_33_product_template msgid "Headset for laptop PC with USB connector." -msgstr "" +msgstr "Komputerowy zestaw słuchawkowy USB" #. module: product #: model:product.category,name:product.product_category_all @@ -746,7 +746,7 @@ msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi" #. module: product #: field:product.product,ean13:0 msgid "EAN13 Barcode" -msgstr "" +msgstr "Kod kreskowy EAN13" #. module: product #: model:ir.actions.act_window,name:product.action_product_price_list @@ -1200,7 +1200,7 @@ msgstr "Wiadomości i historia komunikacji" #. module: product #: model:product.uom,name:product.product_uom_kgm msgid "kg" -msgstr "" +msgstr "kg" #. module: product #: selection:product.template,state:0 @@ -1210,7 +1210,7 @@ msgstr "Zdezaktualizowany" #. module: product #: model:product.uom,name:product.product_uom_km msgid "km" -msgstr "" +msgstr "km" #. module: product #: field:product.template,standard_price:0 @@ -1371,6 +1371,8 @@ msgid "" "This field holds the image used as image for the product, limited to " "1024x1024px." msgstr "" +"To pole utrzymuje obraz użyty jako zdjęcie produktu, limitowany rozmiar " +"1024x1024." #. module: product #: help:product.pricelist.item,categ_id:0 @@ -1548,7 +1550,7 @@ msgstr "" #. module: product #: model:product.uom,name:product.product_uom_cm msgid "cm" -msgstr "" +msgstr "cm" #. module: product #: model:ir.model,name:product.model_product_uom From 322eebf3f746bf22b86c43c348202529f4fab000 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 22 Apr 2014 12:50:39 +0200 Subject: [PATCH 13/18] [FIX] sale: move demo data from sale to sale_stock A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s --- addons/sale/sale_demo.xml | 1 - addons/sale_stock/sale_stock_demo.xml | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 428b586ffa8..f5566e68365 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -329,7 +329,6 @@ Thanks! service 150.0 100.0 - produce diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml index 15b1e60b829..356f6a8fa38 100644 --- a/addons/sale_stock/sale_stock_demo.xml +++ b/addons/sale_stock/sale_stock_demo.xml @@ -38,6 +38,10 @@ make_to_order + + produce + + From 70dc4456d75baace439064973f467ec5d5dac848 Mon Sep 17 00:00:00 2001 From: "Ravi Gohil (OpenERP)" Date: Tue, 22 Apr 2014 16:41:15 +0530 Subject: [PATCH 14/18] [FIX] account: Advance search on 'Tax' from journal items leads to traceback if we do not select any journal. (Maintenance Case: 606875) bzr revid: rgo@tinyerp.com-20140422111115-17e6juruftp3oj2r --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index e18df8a0d31..36d0ba0947f 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1964,7 +1964,7 @@ class account_tax(osv.osv): elif context.get('type') in ('in_invoice','in_refund'): args += [('type_tax_use','in',['purchase','all'])] - if context and context.has_key('journal_id'): + if context and context.get('journal_id'): journal = journal_pool.browse(cr, uid, context.get('journal_id')) if journal.type in ('sale', 'purchase'): args += [('type_tax_use','in',[journal.type,'all'])] From df85f3baf6996af78a886a8e9a0399f51531238a Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 22 Apr 2014 15:05:06 +0200 Subject: [PATCH 15/18] [FIX] note: typo in manifest bzr revid: dle@openerp.com-20140422130506-934g9o433kdhmwnp --- addons/note/__openerp__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py index 2653c558923..e94a5f60181 100644 --- a/addons/note/__openerp__.py +++ b/addons/note/__openerp__.py @@ -27,8 +27,8 @@ This module allows users to create their own notes inside OpenERP ================================================================= -Use notes to write meeting minutes, organize ideas, organize personnal todo -lists, etc. Each user manages his own personnal Notes. Notes are available to +Use notes to write meeting minutes, organize ideas, organize personal todo +lists, etc. Each user manages his own personal Notes. Notes are available to their authors only, but they can share notes to others users so that several people can work on the same note in real time. It's very efficient to share meeting minutes. From b981f3f8efa54db76451645562057fff26baab69 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 22 Apr 2014 17:07:10 +0200 Subject: [PATCH 16/18] [FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5 --- addons/account/account_invoice_view.xml | 2 +- addons/account/project/project_view.xml | 2 +- addons/crm/crm_lead_view.xml | 4 ++-- addons/crm/crm_phonecall_view.xml | 2 +- addons/project_issue/project_issue_view.xml | 2 +- addons/purchase/purchase_view.xml | 4 ++-- addons/sale/sale_view.xml | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 94b98b78907..947aad481d1 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -457,7 +457,7 @@ - + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 00547261ca2..600056c05f1 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -31,7 +31,7 @@ - + diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 7c087ebd5a8..e0311d1db40 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -328,7 +328,7 @@ - + @@ -546,7 +546,7 @@ - + diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 2d456cc053a..21e18d8affc 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -186,7 +186,7 @@ - + diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 74c83afd304..494f054f8e8 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -150,7 +150,7 @@ - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 3504d49a884..3c8afceb6e7 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -270,7 +270,7 @@ - + @@ -297,7 +297,7 @@ - + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index f12cba6ac9f..16e9e2a6305 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -307,7 +307,7 @@ - + @@ -471,7 +471,7 @@ - + @@ -497,7 +497,7 @@ - + From c6189d91a0f3a313393e48e2f3dc86d34c84542e Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 22 Apr 2014 17:07:36 +0200 Subject: [PATCH 17/18] [FIX] base: in partner search view, use operator=child_of instead of filter_domain with a child_of domain operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name bzr revid: dle@openerp.com-20140422150736-o2t3eank6yqttlel --- openerp/addons/base/res/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 9ff9649b8b7..fd394549f4b 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -340,7 +340,7 @@ - + From 6083ed4b46dab046fe4e21bdb479afb7cd1d3216 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 22 Apr 2014 17:09:18 +0200 Subject: [PATCH 18/18] [FIX] web: abitility to do exact id matching with child_of operator for searchs on many2one fields bzr revid: dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g --- addons/web/static/src/js/search.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index b82ad6504a9..1f616202c3f 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1578,8 +1578,11 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ return facetValue.get('label'); }, make_domain: function (name, operator, facetValue) { - if (operator === this.default_operator) { + switch(operator){ + case this.default_operator: return [[name, '=', facetValue.get('value')]]; + case 'child_of': + return [[name, 'child_of', facetValue.get('value')]]; } return this._super(name, operator, facetValue); },