From 1f71463cfc1261415d2c42044b396aa173688498 Mon Sep 17 00:00:00 2001 From: "Darshan Kalola (OpenERP)" Date: Wed, 19 Feb 2014 16:22:46 +0530 Subject: [PATCH 01/23] [IMP] extract subtype ordering from lp:~openerp-dev/openobject-addons/trunk-visibility-hr_holidays-darshan. bzr revid: dka@tinyerp.com-20140219105246-qmm78w81erhfvhlc --- addons/mail/mail_message_subtype.py | 2 ++ addons/mail/mail_thread.py | 3 ++- addons/mail/static/src/css/mail.css | 4 ++++ addons/mail/static/src/js/mail_followers.js | 8 ++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py index bef6e427c3b..427f3396c35 100644 --- a/addons/mail/mail_message_subtype.py +++ b/addons/mail/mail_message_subtype.py @@ -50,7 +50,9 @@ class mail_message_subtype(osv.osv): help="Model the subtype applies to. If False, this subtype applies to all models."), 'default': fields.boolean('Default', help="Activated by default when subscribing."), + 'sequence': fields.integer('Sequence'), } + _order = 'sequence' _defaults = { 'default': True, } diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 9a8adee31c3..94c6bbca788 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -19,6 +19,7 @@ # ############################################################################## +from collections import OrderedDict import base64 import datetime import dateutil @@ -186,7 +187,7 @@ class mail_thread(osv.AbstractModel): # find current model subtypes, add them to a dictionary subtype_obj = self.pool.get('mail.message.subtype') subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context) - subtype_dict = dict((subtype.name, dict(default=subtype.default, followed=False, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context)) + subtype_dict = OrderedDict((subtype.name, OrderedDict(default=subtype.default, followed=False, parent_model=subtype.parent_id.res_model, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context)) for id in ids: res[id]['message_subtype_data'] = subtype_dict.copy() diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index bfae7571a9c..fee73a7e08d 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -757,4 +757,8 @@ .openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item { visibility: visible; } +.subtype-border { + border-bottom: 1px solid #dddddd; + margin-bottom: 10px; +} diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index 938d6a01f6d..2986b700560 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -267,7 +267,15 @@ openerp_mail_followers = function(session, mail) { var records = data[id].message_subtype_data; this.records_length = $.map(records, function(value, index) { return index; }).length; if (this.records_length > 1) { self.display_followers(); } + var old_model = ''; _(records).each(function (record, record_name) { + if (old_model != record.parent_model){ + if (old_model != ''){ + var index = $($list).find('.oe_subtype').length; + $($($list).find('.oe_subtype')[index-1]).addClass('subtype-border'); + } + old_model = record.parent_model; + } record.name = record_name; record.followed = record.followed || undefined; $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list); From b3722090cc0647f3b6a11708d50299defed8ad13 Mon Sep 17 00:00:00 2001 From: "Darshan Kalola (OpenERP)" Date: Wed, 19 Feb 2014 16:38:45 +0530 Subject: [PATCH 02/23] [IMP]add help in sequence field. bzr revid: dka@tinyerp.com-20140219110845-r8r90mzkw73otdx1 --- addons/mail/mail_message_subtype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py index 427f3396c35..a15cf1a79a7 100644 --- a/addons/mail/mail_message_subtype.py +++ b/addons/mail/mail_message_subtype.py @@ -50,7 +50,7 @@ class mail_message_subtype(osv.osv): help="Model the subtype applies to. If False, this subtype applies to all models."), 'default': fields.boolean('Default', help="Activated by default when subscribing."), - 'sequence': fields.integer('Sequence'), + 'sequence': fields.integer('Sequence', help="Used to order subtypes."), } _order = 'sequence' _defaults = { From b949cef63c9b125d1e0501741d341479eb221850 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 21 Feb 2014 05:48:43 +0000 Subject: [PATCH 03/23] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140221054843-7g7jwzx085jnes1q --- .../analytic_contract_hr_expense/i18n/ja.po | 72 +++++++++++++++++++ addons/hr_recruitment/i18n/zh_CN.po | 30 ++++---- addons/hr_timesheet_sheet/i18n/zh_CN.po | 28 ++++---- 3 files changed, 101 insertions(+), 29 deletions(-) create mode 100644 addons/analytic_contract_hr_expense/i18n/ja.po diff --git a/addons/analytic_contract_hr_expense/i18n/ja.po b/addons/analytic_contract_hr_expense/i18n/ja.po new file mode 100644 index 00000000000..2f2b5c3dd6a --- /dev/null +++ b/addons/analytic_contract_hr_expense/i18n/ja.po @@ -0,0 +1,72 @@ +# 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: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2014-02-21 02:29+0000\n" +"Last-Translator: FULL NAME \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-21 05:48+0000\n" +"X-Generator: Launchpad (build 16916)\n" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "or view" +msgstr "または参照" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "Nothing to invoice, create" +msgstr "" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "expenses" +msgstr "経費" + +#. module: analytic_contract_hr_expense +#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account +msgid "Analytic Account" +msgstr "分析勘定" + +#. module: analytic_contract_hr_expense +#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:144 +#, python-format +msgid "Expenses to Invoice of %s" +msgstr "" + +#. module: analytic_contract_hr_expense +#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:136 +#, python-format +msgid "Expenses of %s" +msgstr "%sの経費" + +#. module: analytic_contract_hr_expense +#: field:account.analytic.account,expense_invoiced:0 +#: field:account.analytic.account,expense_to_invoice:0 +#: field:account.analytic.account,remaining_expense:0 +msgid "unknown" +msgstr "不明" + +#. module: analytic_contract_hr_expense +#: field:account.analytic.account,est_expenses:0 +msgid "Estimation of Expenses to Invoice" +msgstr "請求対象経費見込" + +#. module: analytic_contract_hr_expense +#: field:account.analytic.account,charge_expenses:0 +msgid "Charge Expenses" +msgstr "経費請求" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "⇒ Invoice" +msgstr "⇒ 請求" diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po index 9d8dd82a732..d403b334e55 100644 --- a/addons/hr_recruitment/i18n/zh_CN.po +++ b/addons/hr_recruitment/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-02-11 15:26+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2014-02-20 15:53+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: Chinese (Simplified) \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-28 06:29+0000\n" -"X-Generator: Launchpad (build 16914)\n" +"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n" +"X-Generator: Launchpad (build 16916)\n" #. module: hr_recruitment #: help:hr.applicant,active:0 @@ -33,24 +33,24 @@ msgstr "必备条件" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Application Summary" -msgstr "" +msgstr "申请摘要" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Start Interview" -msgstr "" +msgstr "开始面试" #. module: hr_recruitment #: view:hr.applicant:0 msgid "Mobile:" -msgstr "" +msgstr "手机：" #. module: hr_recruitment #: help:hr.recruitment.stage,fold:0 msgid "" "This stage is not visible, for example in status bar or kanban view, when " "there are no records in that stage to display." -msgstr "" +msgstr "此阶段是不可见的。例如：状态栏或看板视图中，在该阶段中 不存在可显示的记录。" #. module: hr_recruitment #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate @@ -99,7 +99,7 @@ msgstr "暂停的职位" #: view:hr.applicant:0 #: field:hr.applicant,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "未读消息" #. module: hr_recruitment #: field:hr.applicant,company_id:0 @@ -157,7 +157,7 @@ msgstr "" #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job msgid "Applications" -msgstr "" +msgstr "求职申请" #. module: hr_recruitment #: field:hr.applicant,day_open:0 @@ -167,12 +167,12 @@ msgstr "开启天数" #. module: hr_recruitment #: field:hr.applicant,emp_id:0 msgid "employee" -msgstr "" +msgstr "雇员" #. module: hr_recruitment #: field:hr.config.settings,fetchmail_applicants:0 msgid "Create applicants from an incoming email account" -msgstr "" +msgstr "从电子邮件帐号接收的邮件创建求职申请" #. module: hr_recruitment #: view:hr.recruitment.report:0 @@ -184,7 +184,7 @@ msgstr "天数" #: view:hr.recruitment.partner.create:0 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create msgid "Create Contact" -msgstr "" +msgstr "新建联系人" #. module: hr_recruitment #: view:hr.applicant:0 @@ -808,7 +808,7 @@ msgstr "生效" #: view:hr.recruitment.report:0 #: field:hr.recruitment.report,nbr:0 msgid "# of Applications" -msgstr "" +msgstr "个申请" #. module: hr_recruitment #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act @@ -1251,7 +1251,7 @@ msgstr "开始" #. module: hr_recruitment #: view:board.board:0 msgid "Applications to be Processed" -msgstr "" +msgstr "待处理的申请" #. module: hr_recruitment #: view:hr.applicant:0 diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po index a5871aa0fab..532fb4af074 100644 --- a/addons/hr_timesheet_sheet/i18n/zh_CN.po +++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-11-01 08:13+0000\n" -"Last-Translator: 盈通 ccdos \n" +"PO-Revision-Date: 2014-02-20 15:57+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \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-28 06:13+0000\n" -"X-Generator: Launchpad (build 16914)\n" +"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n" +"X-Generator: Launchpad (build 16916)\n" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 @@ -33,7 +33,7 @@ msgstr "服务" #: field:hr.timesheet.report,quantity:0 #: field:timesheet.report,quantity:0 msgid "Time" -msgstr "" +msgstr "时间" #. module: hr_timesheet_sheet #: help:hr.config.settings,timesheet_max_difference:0 @@ -92,7 +92,7 @@ msgstr "# 成本" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "未读消息" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 @@ -133,7 +133,7 @@ msgstr "日期到" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "to" -msgstr "" +msgstr "到" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0 @@ -145,7 +145,7 @@ msgstr "根据计工单" #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398 #, python-format msgid "You cannot modify an entry in a confirmed timesheet." -msgstr "" +msgstr "你不能修改已确认的时间表条目" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 @@ -188,13 +188,13 @@ msgstr "拒绝" #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet msgid "Timesheet Activities" -msgstr "" +msgstr "时间表活动" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38 #, python-format msgid "Please create an employee and associate it with this user." -msgstr "" +msgstr "请创建员工信息并关联到此用户" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402 @@ -202,7 +202,7 @@ msgstr "" #, python-format msgid "" "You cannot enter an attendance date outside the current timesheet dates." -msgstr "" +msgstr "无法录入当前时间表以外的出勤日期" #. module: hr_timesheet_sheet #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205 @@ -226,7 +226,7 @@ msgstr "" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,message_ids:0 msgid "Messages" -msgstr "" +msgstr "消息" #. module: hr_timesheet_sheet #: help:hr_timesheet_sheet.sheet,state:0 @@ -252,7 +252,7 @@ msgstr "" #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38 #, python-format msgid "Error!" -msgstr "" +msgstr "错误！" #. module: hr_timesheet_sheet #: field:hr.config.settings,timesheet_max_difference:0 @@ -307,7 +307,7 @@ msgstr "员工计工单" #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "无效的动作！" #. module: hr_timesheet_sheet #: view:hr.timesheet.report:0 From 09c90c3a5309cb1d666818da983d5a91616adb8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 11:28:23 +0100 Subject: [PATCH 04/23] [ADD] mail: mail_message_subtype: add a hidden field, to hide some subtypes from the followers widget. This will be used to hide the created subtype on the task or issues for example, while still available on the related project. The subtype on the task is necessary to trigger the various autosubscription and notification mechanisms but its display on task/issue is not. bzr revid: tde@openerp.com-20140221102823-ca1bvw3qi9kf61uq --- addons/mail/mail_message_subtype.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py index a15cf1a79a7..941011934e8 100644 --- a/addons/mail/mail_message_subtype.py +++ b/addons/mail/mail_message_subtype.py @@ -51,8 +51,10 @@ class mail_message_subtype(osv.osv): 'default': fields.boolean('Default', help="Activated by default when subscribing."), 'sequence': fields.integer('Sequence', help="Used to order subtypes."), + 'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options") } _order = 'sequence' _defaults = { 'default': True, + 'sequence': 1, } From 7e2bf04b4a51f3a3aafbec607ae319afb29ee3e0 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 21 Feb 2014 11:47:25 +0100 Subject: [PATCH 05/23] [FIX] website: bootstrap is now in web module bzr revid: chs@openerp.com-20140221104725-e1w0t9ety5oqjf0y --- addons/website/views/website_templates.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 88cb65b9daa..42c0ad46dbb 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -250,7 +250,7 @@ - + From 41f91e2bef47d82942f30005413431171182b8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:26:43 +0100 Subject: [PATCH 06/23] [IMP] sale_crm: subtypes: added sequence bzr revid: tde@openerp.com-20140221112643-thzam5r0db5cfiq6 --- addons/sale_crm/sale_crm_data.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml index 519af2a976b..1996f367202 100644 --- a/addons/sale_crm/sale_crm_data.xml +++ b/addons/sale_crm/sale_crm_data.xml @@ -5,12 +5,14 @@ Quotation Send + 20 crm.case.section section_id Sales Order Confirmed + 21 crm.case.section section_id From 3a2d8d1496c50a9d68a418a4670ce37536931b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:27:04 +0100 Subject: [PATCH 07/23] [IMP] project, project_issue: added sequence on subtypes bzr revid: tde@openerp.com-20140221112704-lqd4o5bnljn84yxs --- addons/project/project_data.xml | 5 +++++ addons/project_issue/project_issue_data.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index 7ddc983bf1c..95a76d8988e 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -78,6 +78,7 @@ Task Created project.task + Task created @@ -101,6 +102,7 @@ Task Created + 10 project.project @@ -108,6 +110,7 @@ Task Assigned + 11 project.project @@ -115,12 +118,14 @@ Task Blocked + 12 project.project project_id Task Stage Changed + 13 project.project project_id diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml index 25a336d4094..d60106dffd2 100644 --- a/addons/project_issue/project_issue_data.xml +++ b/addons/project_issue/project_issue_data.xml @@ -33,6 +33,7 @@ Access all issues from the top Project menu, and access the issues of a specific Issue Created project.issue + Issue created @@ -56,6 +57,7 @@ Access all issues from the top Project menu, and access the issues of a specific Issue Created + 20 project.project @@ -63,6 +65,7 @@ Access all issues from the top Project menu, and access the issues of a specific Issue Assigned + 21 project.project @@ -70,12 +73,14 @@ Access all issues from the top Project menu, and access the issues of a specific Issue Blocked + 22 project.project project_id Issue Stage Changed + 23 project.project Stage changed From e2eb37efe2fd9c352c80ed43cb75fb11a027051d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:28:16 +0100 Subject: [PATCH 08/23] [IMP] mail: do not fetch hidden subtypes in follower widgets bzr revid: tde@openerp.com-20140221112816-xhtc97az72ip355o --- addons/mail/mail_thread.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index e8197e52335..55e3ce67579 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -186,8 +186,17 @@ class mail_thread(osv.AbstractModel): # find current model subtypes, add them to a dictionary subtype_obj = self.pool.get('mail.message.subtype') - subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context) - subtype_dict = OrderedDict((subtype.name, OrderedDict(default=subtype.default, followed=False, parent_model=subtype.parent_id.res_model, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context)) + subtype_ids = subtype_obj.search( + cr, uid, [ + '&', ('hidden', '=', False), '|', ('res_model', '=', self._name), ('res_model', '=', False) + ], context=context) + subtype_dict = OrderedDict( + (subtype.name, { + 'default': subtype.default, + 'followed': False, + 'parent_model': subtype.parent_id and subtype.parent_id.res_model or self._name, + 'id': subtype.id} + ) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context)) for id in ids: res[id]['message_subtype_data'] = subtype_dict.copy() From 6813592da8981eeb7b1f76503bc341c57a2317fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:29:04 +0100 Subject: [PATCH 09/23] [IMP] mail: subtype model: cleaning + improved form view to add the new fields bzr revid: tde@openerp.com-20140221112904-ijgkqy5zhco5a9i4 --- addons/mail/mail_message_subtype.py | 4 +++- addons/mail/mail_message_subtype.xml | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py index 941011934e8..bae4d941a52 100644 --- a/addons/mail/mail_message_subtype.py +++ b/addons/mail/mail_message_subtype.py @@ -29,6 +29,8 @@ class mail_message_subtype(osv.osv): on the Wall. """ _name = 'mail.message.subtype' _description = 'Message subtypes' + _order = 'sequence, id' + _columns = { 'name': fields.char('Message Type', required=True, translate=True, help='Message subtype gives a more precise type on the message, '\ @@ -53,7 +55,7 @@ class mail_message_subtype(osv.osv): 'sequence': fields.integer('Sequence', help="Used to order subtypes."), 'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options") } - _order = 'sequence' + _defaults = { 'default': True, 'sequence': 1, diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml index a79f5815bd1..efcb81b5794 100644 --- a/addons/mail/mail_message_subtype.xml +++ b/addons/mail/mail_message_subtype.xml @@ -9,6 +9,7 @@ + @@ -22,12 +23,18 @@
- - - - - - + + + + + + + + + + + +
From d3ea25c0bac0467dcdd4adf91e2a7c906b986054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:29:15 +0100 Subject: [PATCH 10/23] [IMP] crm: added sequence on subtypes bzr revid: tde@openerp.com-20140221112915-1o9pk3gjohtl558w --- addons/crm/crm_lead_data.xml | 5 +++++ addons/mail/data/mail_data.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml index 6bb8e2700d4..1abcdac9712 100644 --- a/addons/crm/crm_lead_data.xml +++ b/addons/crm/crm_lead_data.xml @@ -146,6 +146,7 @@ Lead Created + crm.lead Lead created @@ -171,6 +172,7 @@ Lead Created + 10 crm.case.section @@ -178,18 +180,21 @@ Opportunity Stage Changed + 11 crm.case.section section_id Opportunity Won + 12 crm.case.section section_id Opportunity Lost + 13 crm.case.section diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index e1ca797670b..4a2dc6d06f0 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -54,6 +54,7 @@ Discussions + From 587c8474b03075a05413b39c990b09d14d746a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:39:19 +0100 Subject: [PATCH 11/23] [FIX] mail: fixed regression caused by forward-porting saas-3: re-removed the hack in mail_thread about subscription in create mode. bzr revid: tde@openerp.com-20140221113919-3b51stz2u9rj4kcz --- addons/mail/mail_thread.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 633132583ed..063b45c8c64 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -1580,10 +1580,7 @@ class mail_thread(osv.AbstractModel): if set(partner_ids) == set([user_pid]): try: self.check_access_rights(cr, uid, 'read') - if context.get('operation', '') == 'create': - self.check_access_rule(cr, uid, ids, 'create') - else: - self.check_access_rule(cr, uid, ids, 'read') + self.check_access_rule(cr, uid, ids, 'read') except (osv.except_osv, orm.except_orm): return False else: From 6709242bb8a6d653c6a9ae274d2b621537452418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 21 Feb 2014 12:40:04 +0100 Subject: [PATCH 12/23] [CLEAN] gamification: removed .moved folder, added when forward porting saas-3 into trunk. bzr revid: tde@openerp.com-20140221114004-9ee33tn3ilk6rekf --- .../gamification/i18n.moved/gamification.pot | 1733 ----------------- 1 file changed, 1733 deletions(-) delete mode 100644 addons/gamification/i18n.moved/gamification.pot diff --git a/addons/gamification/i18n.moved/gamification.pot b/addons/gamification/i18n.moved/gamification.pot deleted file mode 100644 index 0ef4cdbea64..00000000000 --- a/addons/gamification/i18n.moved/gamification.pot +++ /dev/null @@ -1,1733 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * gamification -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 8.0alpha1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-13 15:08+0000\n" -"PO-Revision-Date: 2014-02-13 15:08+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Search Goals" -msgstr "" - -#. module: gamification -#: model:gamification.goal.definition,name:gamification.definition_base_company_data -msgid "Set your Company Data" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,report_message_frequency:0 -msgid "Never" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,computation_mode:0 -msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: view:gamification.goal:0 -#: field:gamification.goal.wizard,goal_id:0 -msgid "Goal" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,period:0 -msgid "Non recurring" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,next_report_date:0 -msgid "Next Report Date" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,monetary:0 -msgid "Monetary Value" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "My Goals" -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,condition:0 -msgid "The lower the better" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user.wizard:0 -#: view:gamification.goal.wizard:0 -msgid "Grant Badge To" -msgstr "" - -#. module: gamification -#: help:gamification.badge,stat_count_distinct:0 -msgid "The number of time this badge has been received by unique users." -msgstr "" - -#. module: gamification -#: help:gamification.badge,unique_owner_ids:0 -msgid "The list of unique users having received this badge." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: view:gamification.goal:0 -#: view:gamification.goal.definition:0 -msgid "Group By..." -msgstr "" - -#. module: gamification -#: model:gamification.challenge,name:gamification.challenge_base_configure -msgid "Setup your Company" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "/∞" -msgstr "" - -#. module: gamification -#: code:addons/gamification/wizard/grant_badge.py:44 -#, python-format -msgid "You can not grant a badge to yourself" -msgstr "" - -#. module: gamification -#: field:gamification.goal,completeness:0 -msgid "Completeness" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,field_date_id:0 -msgid "Date Field" -msgstr "" - -#. module: gamification -#: help:gamification.badge,stat_my_this_month:0 -msgid "The number of time the current user has received this badge this month." -msgstr "" - -#. module: gamification -#: selection:gamification.challenge.line,condition:0 -msgid ">=" -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,name:gamification.challenge_wizard -msgid "Challenge Description" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_badge_user_wizard -msgid "gamification.badge.user.wizard" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Reward" -msgstr "" - -#. module: gamification -#: help:gamification.badge,message_ids:0 -#: help:gamification.challenge,message_ids:0 -#: help:gamification.goal,message_ids:0 -msgid "Messages and communication history" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,category:0 -msgid "Define the visibility of the challenge through menus" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Refresh Challenge" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_challenge_line -msgid "Gamification generic goal for challenge" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,definition_monetary:0 -msgid "Monetary" -msgstr "" - -#. module: gamification -#: selection:gamification.goal,state:0 -msgid "In progress (to update)" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_goal_definition -msgid "Gamification goal definition" -msgstr "" - -#. module: gamification -#: help:gamification.badge,remaining_sending:0 -msgid "If a maxium is set" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,invited_user_ids:0 -msgid "Suggest to users" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: model:ir.actions.act_window,name:gamification.goal_list_action -#: model:ir.ui.menu,name:gamification.gamification_goal_menu -msgid "Goals" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Badge Description" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "than the target." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Badges are granted when a challenge is finished. This is either at the end of a running period (eg: end of the month for a monthly challenge), at the end date of a challenge (if no periodicity is set) or when the challenge is manually closed." -msgstr "" - -#. module: gamification -#: help:gamification.challenge,manager_id:0 -msgid "The user responsible for the challenge." -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/goal.py:385 -#, python-format -msgid "Update %s" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,description:0 -msgid "Goal Description" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "this month" -msgstr "" - -#. module: gamification -#: field:gamification.badge,owner_ids:0 -msgid "Owners" -msgstr "" - -#. module: gamification -#: field:gamification.badge.user,sender_id:0 -msgid "Sender" -msgstr "" - -#. module: gamification -#: field:gamification.badge,stat_my_this_month:0 -msgid "My Monthly Total" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,remind_update_delay:0 -msgid "Never reminded if no value or zero is specified." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: field:gamification.challenge.line,challenge_id:0 -#: field:gamification.goal,challenge_id:0 -msgid "Challenge" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,condition:0 -msgid "Goal Performance" -msgstr "" - -#. module: gamification -#: field:gamification.badge,message_ids:0 -#: field:gamification.challenge,message_ids:0 -#: field:gamification.goal,message_ids:0 -msgid "Messages" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "badges this month" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:517 -#: code:addons/gamification/models/goal.py:351 -#, python-format -msgid "Error!" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,line_ids:0 -msgid "Lines" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user:0 -msgid "Granted by" -msgstr "" - -#. module: gamification -#: field:gamification.badge,stat_count_distinct:0 -msgid "Number of users" -msgstr "" - -#. module: gamification -#: help:gamification.badge,message_unread:0 -#: help:gamification.challenge,message_unread:0 -#: help:gamification.goal,message_unread:0 -msgid "If checked new messages require your attention." -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users -msgid "Create User" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,period:0 -#: selection:gamification.challenge,report_message_frequency:0 -msgid "Yearly" -msgstr "" - -#. module: gamification -#: selection:gamification.badge,rule_auth:0 -msgid "People having some badges" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "granted," -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,definition_full_suffix:0 -#: field:gamification.goal,definition_suffix:0 -#: field:gamification.goal.definition,suffix:0 -msgid "Suffix" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Reference" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,autojoin_group_id:0 -msgid "Auto-subscription Group" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "refresh" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Even if the challenge is failed, best challengers will be rewarded" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,reward_id:0 -msgid "For Every Succeding User" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,target_goal:0 -msgid "Target Value to Reach" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,start_date:0 -msgid "The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Notification Messages" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,manager_id:0 -msgid "Responsible" -msgstr "" - -#. module: gamification -#. openerp-web -#: code:addons/gamification/static/src/xml/gamification.xml:108 -#, python-format -msgid "more details..." -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,name:gamification.badge_list_action -#: model:ir.ui.menu,name:gamification.gamification_badge_menu -msgid "Badges" -msgstr "" - -#. module: gamification -#: help:gamification.badge,rule_auth_badge_ids:0 -msgid "Only the people having these badges can give this badge" -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,computation_mode:0 -msgid "Recorded manually" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Statistics" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "From" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Granting" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Grant" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -msgid "e.g. days" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,definition_id:0 -#: view:gamification.goal:0 -#: field:gamification.goal,definition_id:0 -#: field:gamification.goal.definition,name:0 -msgid "Goal Definition" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,sequence:0 -msgid "Sequence" -msgstr "" - -#. module: gamification -#: selection:gamification.goal,state:0 -msgid "Failed" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: field:gamification.challenge,state:0 -#: view:gamification.goal:0 -#: field:gamification.goal,state:0 -msgid "State" -msgstr "" - -#. module: gamification -#: field:gamification.badge,message_follower_ids:0 -#: field:gamification.challenge,message_follower_ids:0 -#: field:gamification.goal,message_follower_ids:0 -msgid "Followers" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,reward_first_id:0 -msgid "For 1st user" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Can not grant" -msgstr "" - -#. module: gamification -#: field:gamification.badge,message_unread:0 -#: field:gamification.challenge,message_unread:0 -#: field:gamification.goal,message_unread:0 -msgid "Unread Messages" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,display_mode:0 -msgid "Displayed as" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -#: field:gamification.badge,name:0 -#: field:gamification.badge.user,badge_id:0 -#: field:gamification.badge.user.wizard,badge_id:0 -msgid "Badge" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,suffix:0 -msgid "The unit of the target and current values" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act -msgid "Related Goals" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Subscriptions" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user.wizard:0 -#: model:ir.actions.act_window,name:gamification.action_grant_wizard -msgid "Grant Badge" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:683 -#, python-format -msgid "
Reward (badge %s) for every succeeding user was sent to %s." -msgstr "" - -#. module: gamification -#: help:gamification.badge,message_summary:0 -#: help:gamification.challenge,message_summary:0 -#: help:gamification.goal,message_summary:0 -msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views." -msgstr "" - -#. module: gamification -#: field:gamification.challenge,report_message_group_id:0 -msgid "Send a copy to" -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,help:gamification.challenge_list_action -msgid "

\n" -" Click to create a challenge. \n" -"

\n" -"

\n" -" Assign a list of goals to chosen users to evaluate them.\n" -" The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n" -" The goals are created for the specified users or member of the group.\n" -"

\n" -" " -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:695 -#, python-format -msgid "Nobody reached the required conditions to receive special badges." -msgstr "" - -#. module: gamification -#. openerp-web -#: code:addons/gamification/static/src/xml/gamification.xml:35 -#: code:addons/gamification/static/src/xml/gamification.xml:57 -#, python-format -msgid "Target: <=" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Reminders for Manual Goals" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/goal.py:265 -#, python-format -msgid "Invalid return content from the evaluation of %s" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -#: field:gamification.goal.definition,computation_mode:0 -msgid "Computation Mode" -msgstr "" - -#. module: gamification -#: model:email.template,body_html:gamification.simple_report_template -msgid "
${object.name}\n" -"

The following message contains the current progress for the challenge ${object.name}

\n" -"\n" -"% if object.visibility_mode == 'personal':\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % for line in ctx[\"challenge_lines\"]:\n" -" = 100:\n" -" style=\"font-weight:bold;\"\n" -" % endif\n" -" >\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % endfor\n" -"
GoalTargetCurrentCompleteness
${line['name']}${line['target']}\n" -" % if line['suffix']:\n" -" ${line['suffix']}\n" -" % endif\n" -" ${line['current']}\n" -" % if line['suffix']:\n" -" ${line['suffix']}\n" -" % endif\n" -" ${line['completeness']} %
\n" -"% else:\n" -" % for line in ctx[\"challenge_lines\"]:\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % for goal in line['goals']:\n" -" = 100:\n" -" style=\"font-weight:bold;\"\n" -" % endif\n" -" >\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % endfor\n" -"
${line['name']}
#PersonCompletenessCurrent
${goal['rank']}${goal['name']}${goal['completeness']}%${goal['current']}/${line['target']}\n" -" % if line['suffix']:\n" -" ${line['suffix']}\n" -" % endif\n" -"


\n" -"\n" -" % endfor\n" -"% endif\n" -" " -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,condition:0 -msgid "A goal is considered as completed when the current value is compared to the value to reach" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,remind_update_delay:0 -msgid "Non-updated manual goals will be reminded after" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,full_suffix:0 -msgid "The currency and suffix field" -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,display_mode:0 -msgid "Exclusive (done or not-done)" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/badge.py:223 -#: code:addons/gamification/models/badge.py:225 -#: code:addons/gamification/models/badge.py:227 -#: code:addons/gamification/models/badge.py:229 -#: code:addons/gamification/wizard/grant_badge.py:44 -#, python-format -msgid "Warning!" -msgstr "" - -#. module: gamification -#: field:gamification.goal,last_update:0 -msgid "Last Update" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,report_message_frequency:0 -msgid "Report Frequency" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,field_id:0 -msgid "The field containing the value to evaluate" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,end_date:0 -msgid "The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date." -msgstr "" - -#. module: gamification -#: field:gamification.badge.user,create_date:0 -msgid "Created" -msgstr "" - -#. module: gamification -#: model:gamification.badge,name:gamification.badge_idea -msgid "Brilliant" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,visibility_mode:0 -msgid "Individual Goals" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Invited" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,report_message_frequency:0 -msgid "On change" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,period:0 -#: selection:gamification.challenge,report_message_frequency:0 -msgid "Daily" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: view:gamification.goal.definition:0 -msgid "Goal definitions" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Participating" -msgstr "" - -#. module: gamification -#: help:gamification.badge,rule_auth:0 -msgid "Who can grant this badge" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,last_report_date:0 -msgid "Last Report Date" -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,computation_mode:0 -msgid "Automatic: execute a specific Python code" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_goal_wizard -msgid "gamification.goal.wizard" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_badge_user -msgid "Gamification user badge" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Describe the challenge: what is does, who it targets, why it matters..." -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Goal List" -msgstr "" - -#. module: gamification -#: field:gamification.badge.user,comment:0 -#: field:gamification.badge.user.wizard,comment:0 -msgid "Comment" -msgstr "" - -#. module: gamification -#: selection:gamification.goal,state:0 -msgid "In progress" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Search Challenges" -msgstr "" - -#. module: gamification -#: selection:gamification.badge,rule_auth:0 -msgid "No one, assigned through challenges" -msgstr "" - -#. module: gamification -#: field:gamification.badge,stat_my:0 -msgid "My Total" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "reply later" -msgstr "" - -#. module: gamification -#: field:gamification.badge,image:0 -msgid "Image" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Running Challenges" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,category:0 -msgid "Appears in" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Passed" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -msgid "Clickable Goals" -msgstr "" - -#. module: gamification -#: selection:gamification.goal,state:0 -msgid "Canceled" -msgstr "" - -#. module: gamification -#: field:gamification.badge.user,badge_name:0 -msgid "Badge Name" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,definition_suffix:0 -msgid "Unit" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/badge.py:229 -#, python-format -msgid "You have already sent this badge too many time this month." -msgstr "" - -#. module: gamification -#: field:gamification.badge,stat_my_monthly_sending:0 -msgid "My Monthly Sending Total" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Check Badge" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,period:0 -#: selection:gamification.challenge,report_message_frequency:0 -msgid "Weekly" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Assign Challenge To" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user.wizard:0 -#: view:gamification.challenge:0 -#: view:gamification.goal.wizard:0 -msgid "or" -msgstr "" - -#. module: gamification -#: help:gamification.challenge.line,sequence:0 -msgid "Sequence number for ordering" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Category" -msgstr "" - -#. module: gamification -#: field:gamification.goal,current:0 -msgid "Current Value" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,field_date_id:0 -msgid "The date to use for the time period evaluated" -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act -msgid "

\n" -" There is no goals associated to this challenge matching your search.\n" -" Make sure that your challenge is active and assigned to at least one user.\n" -"

\n" -" " -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,help:gamification.badge_list_action -msgid "

\n" -" Click to create a badge. \n" -"

\n" -"

\n" -" A badge is a symbolic token granted to a user as a sign of reward.\n" -" It can be deserved automatically when some conditions are met or manually by users.\n" -" Some badges are harder than others to get with specific conditions.\n" -"

\n" -" " -msgstr "" - -#. module: gamification -#: field:gamification.badge,rule_auth_badge_ids:0 -msgid "Required Badges" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Line List" -msgstr "" - -#. module: gamification -#: field:gamification.badge,rule_max:0 -msgid "Monthly Limited Sending" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:517 -#, python-format -msgid "Retrieving progress for personal challenge without user information" -msgstr "" - -#. module: gamification -#: model:gamification.goal.definition,name:gamification.definition_base_timezone -msgid "Set your Timezone" -msgstr "" - -#. module: gamification -#: help:gamification.badge,goal_definition_ids:0 -msgid "The users that have succeeded theses goals will receive automatically the badge." -msgstr "" - -#. module: gamification -#: help:gamification.badge,image:0 -msgid "This field holds the image used for the badge, limited to 256x256" -msgstr "" - -#. module: gamification -#: view:gamification.goal.wizard:0 -msgid "Update" -msgstr "" - -#. module: gamification -#: field:gamification.goal,line_id:0 -msgid "Goal Line" -msgstr "" - -#. module: gamification -#: field:gamification.badge,rule_max_number:0 -msgid "Limitation Number" -msgstr "" - -#. module: gamification -#: model:ir.module.category,name:gamification.module_goal_category -msgid "Gamification" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,state:0 -#: view:gamification.goal:0 -#: selection:gamification.goal,state:0 -msgid "Draft" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Reject" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,model_id:0 -msgid "The model object for the field to evaluate" -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,help:gamification.goal_definition_list_action -msgid "

\n" -" Click to create a goal definition. \n" -"

\n" -"

\n" -" A goal definition is a technical model of goal defining a condition to reach.\n" -" The dates, values to reach or users are defined in goal instance.\n" -"

\n" -" " -msgstr "" - -#. module: gamification -#: help:gamification.badge.user,sender_id:0 -msgid "The user who has send the badge" -msgstr "" - -#. module: gamification -#: help:gamification.badge,stat_count:0 -msgid "The number of time this badge has been received." -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -#: field:gamification.goal.definition,model_id:0 -msgid "Model" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_challenge -msgid "Gamification challenge" -msgstr "" - -#. module: gamification -#: help:gamification.badge,rule_max:0 -msgid "Check to set a monthly limit per person of sending this badge" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_badge -msgid "Gamification badge" -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,help:gamification.action_new_simplified_res_users -msgid "Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system." -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Security rules to define who is allowed to manually grant badges. Not enforced for administrator." -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,display_mode:0 -msgid "Progressive (using numerical values)" -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_gamification_goal -msgid "Gamification goal instance" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:685 -#, python-format -msgid "
Nobody has succeeded to reach every goal, no badge is rewared for this challenge." -msgstr "" - -#. module: gamification -#: field:gamification.badge,message_is_follower:0 -#: field:gamification.challenge,message_is_follower:0 -#: field:gamification.goal,message_is_follower:0 -msgid "Is a Follower" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,full_suffix:0 -msgid "Full Suffix" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Advanced Options" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,start_date:0 -#: field:gamification.goal,start_date:0 -msgid "Start Date" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,reward_second_id:0 -msgid "For 2nd user" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Data" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,condition:0 -msgid "Condition" -msgstr "" - -#. module: gamification -#: field:gamification.badge.user,user_id:0 -#: field:gamification.badge.user.wizard,user_id:0 -#: view:gamification.goal:0 -#: field:gamification.goal,user_id:0 -msgid "User" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,domain:0 -msgid "Filter Domain" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Schedule" -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,computation_mode:0 -msgid "Automatic: number of records" -msgstr "" - -#. module: gamification -#: help:gamification.badge,rule_max_number:0 -msgid "The maximum number of time this badge can be sent per month per person." -msgstr "" - -#. module: gamification -#: model:ir.model,name:gamification.model_res_groups -msgid "Access Groups" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -msgid "Formating Options" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,compute_code:0 -msgid "Python code to be executed for each user. 'result' should contains the new current value. Evaluated user can be access through object.user_id." -msgstr "" - -#. module: gamification -#: field:gamification.challenge,user_ids:0 -#: model:ir.model,name:gamification.model_res_users -msgid "Users" -msgstr "" - -#. module: gamification -#: selection:gamification.badge,rule_auth:0 -msgid "A selected list of users" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: view:gamification.challenge.line:0 -msgid "Challenge Lines" -msgstr "" - -#. module: gamification -#: help:gamification.badge,rule_auth_user_ids:0 -msgid "Only these people can give this badge" -msgstr "" - -#. module: gamification -#: field:gamification.badge,active:0 -msgid "Active" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,action_id:0 -msgid "The action that will be called to update the goal value." -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "You can still grant" -msgstr "" - -#. module: gamification -#: field:gamification.goal,computation_mode:0 -msgid "Computation mode" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,action_id:0 -msgid "Action" -msgstr "" - -#. module: gamification -#: model:gamification.goal.definition,name:gamification.definition_base_invite -msgid "Invite new Users" -msgstr "" - -#. module: gamification -#: field:gamification.goal,definition_description:0 -msgid "Definition Description" -msgstr "" - -#. module: gamification -#: model:gamification.badge,name:gamification.badge_problem_solver -msgid "Problem Solver" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Target: less than" -msgstr "" - -#. module: gamification -#: help:gamification.badge,stat_this_month:0 -msgid "The number of time this badge has been received this month." -msgstr "" - -#. module: gamification -#: help:gamification.goal,last_update:0 -msgid "In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in challenge). Ignored in case of non-manual goal or goal not linked to a challenge." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Depending on the Display mode, reports will be individual or shared." -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Start goal" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,period:0 -msgid "Periodicity" -msgstr "" - -#. module: gamification -#: field:gamification.badge.user,create_uid:0 -msgid "Creator" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:692 -#, python-format -msgid "
Special rewards were sent to the top competing users. The ranking for this challenge is :" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,compute_code:0 -msgid "Python Code" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Rewards for challenges" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Send Report" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Period" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,name:0 -msgid "Challenge Name" -msgstr "" - -#. module: gamification -#: model:ir.ui.menu,name:gamification.gamification_menu -msgid "Gamification Tools" -msgstr "" - -#. module: gamification -#: field:gamification.badge,goal_definition_ids:0 -msgid "Rewarded by" -msgstr "" - -#. module: gamification -#: field:gamification.badge,remaining_sending:0 -msgid "Remaining Sending Allowed" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,state:0 -msgid "Done" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,visibility_mode:0 -#: field:gamification.goal,definition_display:0 -msgid "Display Mode" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user.wizard:0 -#: view:gamification.goal.wizard:0 -msgid "Cancel" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "There is no reward upon completion of this challenge." -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,monetary:0 -msgid "The target and current value are defined in the company currency." -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,condition:0 -msgid "The higher the better" -msgstr "" - -#. module: gamification -#: model:gamification.goal.definition,name:gamification.definition_base_company_logo -msgid "Set your Company Logo" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,state:0 -msgid "In Progress" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Goal Reached" -msgstr "" - -#. module: gamification -#: help:gamification.badge,stat_my:0 -msgid "The number of time the current user has received this badge." -msgstr "" - -#. module: gamification -#: help:gamification.challenge,report_message_group_id:0 -msgid "Group that will receive a copy of the report in addition to the user" -msgstr "" - -#. module: gamification -#: field:gamification.goal,target_goal:0 -msgid "To Reach" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,res_id_field:0 -msgid "The field name on the user profile (res.users) containing the value for res_id for action." -msgstr "" - -#. module: gamification -#: help:gamification.goal,remind_update_delay:0 -msgid "The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified." -msgstr "" - -#. module: gamification -#: view:gamification.badge.user.wizard:0 -msgid "Who would you like to reward?" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge.line,condition:0 -msgid "<=" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Configure Challenge" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,period:0 -#: selection:gamification.challenge,report_message_frequency:0 -msgid "Monthly" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,user_ids:0 -msgid "List of users participating to the challenge" -msgstr "" - -#. module: gamification -#: model:email.template,body_html:gamification.email_template_goal_reminder -msgid "
Reminder ${object.name}\n" -"

You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.

\n" -"\n" -"

If you have not changed your score yet, you can use the button \"The current value is up to date\" to indicate so.

" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -#: field:gamification.goal.wizard,current:0 -msgid "Current" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "To" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/badge.py:225 -#, python-format -msgid "You are not in the user allowed list." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "í" -msgstr "" - -#. module: gamification -#: field:gamification.badge,challenge_ids:0 -msgid "Reward of Challenges" -msgstr "" - -#. module: gamification -#: field:gamification.goal,definition_condition:0 -msgid "Definition Condition" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,autojoin_group_id:0 -msgid "Group of users whose members will be automatically added to user_ids once the challenge is started" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -#: model:ir.actions.act_window,name:gamification.goal_definition_list_action -#: model:ir.ui.menu,name:gamification.gamification_definition_menu -msgid "Goal Definitions" -msgstr "" - -#. module: gamification -#: model:gamification.badge,name:gamification.badge_hidden -msgid "Hidden" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: view:gamification.goal:0 -msgid "days" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,report_template_id:0 -msgid "Report Template" -msgstr "" - -#. module: gamification -#: field:gamification.badge,rule_auth:0 -msgid "Allowance to Grant" -msgstr "" - -#. module: gamification -#: selection:gamification.goal.definition,computation_mode:0 -msgid "Automatic: sum on a field" -msgstr "" - -#. module: gamification -#: model:gamification.challenge,name:gamification.challenge_base_discover -msgid "Complete your Profile" -msgstr "" - -#. module: gamification -#: field:gamification.badge,description:0 -#: field:gamification.challenge,description:0 -msgid "Description" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/badge.py:223 -#, python-format -msgid "This badge can not be sent by users." -msgstr "" - -#. module: gamification -#: model:email.template,body_html:gamification.email_template_badge_received -msgid "

Congratulation, you have received the badge ${object.badge_id.name} !\n" -" % if object.sender_id\n" -" This badge was granted by ${object.sender_id.name}.\n" -" % endif\n" -"

\n" -"\n" -" % if object.comment\n" -"

${object.comment}

\n" -" % endif\n" -" " -msgstr "" - -#. module: gamification -#: field:gamification.badge,stat_this_month:0 -msgid "Monthly total" -msgstr "" - -#. module: gamification -#: field:gamification.challenge,reward_third_id:0 -msgid "For 3rd user" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user.wizard:0 -msgid "Describe what they did and why it matters (will be public)" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/badge.py:227 -#, python-format -msgid "You do not have the required badges." -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "e.g. Monthly Sales Objectives" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,line_ids:0 -msgid "List of goals that will be set" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Badge List" -msgstr "" - -#. module: gamification -#: selection:gamification.challenge,visibility_mode:0 -msgid "Leader Board (Group Ranking)" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Reached when current value is" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/goal.py:351 -#, python-format -msgid "Can not modify the configuration of a started goal" -msgstr "" - -#. module: gamification -#: field:gamification.badge,unique_owner_ids:0 -msgid "Unique Owners" -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:665 -#, python-format -msgid "The challenge %s is finished." -msgstr "" - -#. module: gamification -#: field:gamification.challenge,end_date:0 -#: view:gamification.goal:0 -#: field:gamification.goal,end_date:0 -msgid "End Date" -msgstr "" - -#. module: gamification -#: help:gamification.badge,owner_ids:0 -msgid "The list of instances of this badge granted to users" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Goal Failed" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,res_id_field:0 -msgid "ID Field of user" -msgstr "" - -#. module: gamification -#: field:gamification.challenge.line,name:0 -msgid "Name" -msgstr "" - -#. module: gamification -#. openerp-web -#: code:addons/gamification/static/src/xml/gamification.xml:105 -#, python-format -msgid "Invited Challenges" -msgstr "" - -#. module: gamification -#: view:gamification.goal:0 -msgid "Reset Completion" -msgstr "" - -#. module: gamification -#: help:gamification.goal.definition,domain:0 -msgid "Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)]." -msgstr "" - -#. module: gamification -#: help:gamification.badge,stat_my_monthly_sending:0 -msgid "The number of time the current user has sent this badge this month." -msgstr "" - -#. module: gamification -#: help:gamification.goal,challenge_id:0 -msgid "Challenge that generated the goal, assign challenge to users to generate goals with a value in this field." -msgstr "" - -#. module: gamification -#: field:gamification.badge,rule_auth_user_ids:0 -msgid "Authorized Users" -msgstr "" - -#. module: gamification -#: model:ir.actions.act_window,help:gamification.goal_list_action -msgid "

\n" -" Click to create a goal. \n" -"

\n" -"

\n" -" A goal is defined by a user and a goal definition.\n" -" Goals can be created automatically by using challenges.\n" -"

\n" -" " -msgstr "" - -#. module: gamification -#: field:gamification.challenge,reward_failure:0 -msgid "Reward Bests if not Succeeded?" -msgstr "" - -#. module: gamification -#: field:gamification.goal.definition,field_id:0 -msgid "Field to Sum" -msgstr "" - -#. module: gamification -#: field:gamification.badge,message_summary:0 -#: field:gamification.challenge,message_summary:0 -#: field:gamification.goal,message_summary:0 -msgid "Summary" -msgstr "" - -#. module: gamification -#: model:gamification.badge,name:gamification.badge_good_job -msgid "Good Job" -msgstr "" - -#. module: gamification -#. openerp-web -#: code:addons/gamification/static/src/xml/gamification.xml:32 -#: code:addons/gamification/static/src/xml/gamification.xml:54 -#, python-format -msgid "Target:" -msgstr "" - -#. module: gamification -#: view:gamification.goal.wizard:0 -msgid "Set the current value you have reached for this goal" -msgstr "" - -#. module: gamification -#: selection:gamification.badge,rule_auth:0 -msgid "Everyone" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -msgid "How to compute the goal?" -msgstr "" - -#. module: gamification -#: view:gamification.goal.definition:0 -msgid "Search Goal Definitions" -msgstr "" - -#. module: gamification -#: model:gamification.goal.definition,name:gamification.definition_nbr_following -msgid "Mail Group Following" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "Accept" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "Grant this Badge" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -#: model:ir.actions.act_window,name:gamification.challenge_list_action -#: model:ir.ui.menu,name:gamification.gamification_challenge_menu -msgid "Challenges" -msgstr "" - -#. module: gamification -#: model:res.groups,name:gamification.group_goal_manager -msgid "Manager" -msgstr "" - -#. module: gamification -#: view:gamification.challenge:0 -msgid "HR Challenges" -msgstr "" - -#. module: gamification -#: field:gamification.goal,remind_update_delay:0 -msgid "Remind delay" -msgstr "" - -#. module: gamification -#: view:gamification.badge:0 -msgid "No monthly sending limit" -msgstr "" - -#. module: gamification -#: selection:gamification.goal,state:0 -msgid "Reached" -msgstr "" - -#. module: gamification -#: view:gamification.badge.user:0 -msgid "the" -msgstr "" - -#. module: gamification -#: field:gamification.badge,stat_count:0 -msgid "Total" -msgstr "" - -#. module: gamification -#: help:gamification.challenge,period:0 -msgid "Period of automatic goal assigment. If none is selected, should be launched manually." -msgstr "" - From 6b40002f987bbe30fc30f5e72ca744ef79b4c658 Mon Sep 17 00:00:00 2001 From: "Richard Mathot (OpenERP)" Date: Fri, 21 Feb 2014 12:53:47 +0100 Subject: [PATCH 13/23] [ADD] Enable access to workflow engine in server actions that run arbitrary python code (a workflow variable gives now access to trg_* methods of the workflow engine) bzr revid: rim@openerp.com-20140221115347-rpar6uyiwx1z9deu --- openerp/addons/base/ir/ir_actions.py | 2 ++ openerp/addons/base/ir/ir_actions.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 31c170068c8..9adbf2c608f 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -552,6 +552,7 @@ class ir_actions_server(osv.osv): # - uid: current user id # - context: current context # - time: Python time module +# - workflow: Workflow engine # If you plan to return an action, assign: action = {...}""", 'use_relational_model': 'base', 'use_create': 'new', @@ -936,6 +937,7 @@ class ir_actions_server(osv.osv): 'uid': uid, 'user': user, 'context': context, + 'workflow': workflow } def run(self, cr, uid, ids, context=None): diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml index 7ac0252da80..26c08d4f1b0 100644 --- a/openerp/addons/base/ir/ir_actions.xml +++ b/openerp/addons/base/ir/ir_actions.xml @@ -412,6 +412,7 @@
  • cr: database cursor
  • uid: current user id
  • context: current context
    • +
  • workflow: Workflow engine

    • Example of condition expression using Python

    From 13194a10f732540eb38691eef7d7e2ae275c9d4e Mon Sep 17 00:00:00 2001 From: "Richard Mathot (OpenERP)" Date: Fri, 21 Feb 2014 13:57:08 +0100 Subject: [PATCH 14/23] [ADD] Test that the variable 'workflow' is correctly assigned in Python server actions (if not, the code will crash) bzr revid: rim@openerp.com-20140221125708-6vt2ucp5sjtvl02q --- openerp/addons/base/tests/test_ir_actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/tests/test_ir_actions.py b/openerp/addons/base/tests/test_ir_actions.py index 04f67617ad6..baea8299f9e 100644 --- a/openerp/addons/base/tests/test_ir_actions.py +++ b/openerp/addons/base/tests/test_ir_actions.py @@ -97,7 +97,8 @@ class TestServerActions(TestServerActionsBase): self.ir_actions_server.write(cr, uid, self.act_id, { 'state': 'code', 'code': """partner_name = obj.name + '_code' -self.pool["res.partner"].create(cr, uid, {"name": partner_name}, context=context)""" +self.pool["res.partner"].create(cr, uid, {"name": partner_name}, context=context) +workflow""" }) run_res = self.ir_actions_server.run(cr, uid, [self.act_id], context=self.context) self.assertFalse(run_res, 'ir_actions_server: code server action correctly finished should return False') From 013d27b85026880c2e8f53c9c8bea94cd009fc94 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 21 Feb 2014 15:34:48 +0100 Subject: [PATCH 15/23] [IMP] filter out phantomjs warning on OSX bzr revid: xmo@openerp.com-20140221143448-tpx62ua785kc8gfx --- openerp/tests/common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/tests/common.py b/openerp/tests/common.py index 2f10371a8f0..b68bbfe20df 100644 --- a/openerp/tests/common.py +++ b/openerp/tests/common.py @@ -216,6 +216,8 @@ class HttpCase(TransactionCase): line, buf = buf.split('\n', 1) line = str(line) + if 'CoreText' in line: + continue if line == "ok": break if line.startswith("error"): From 186bb976380bda95d981ce5522854af0c31b4316 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 21 Feb 2014 22:57:09 +0100 Subject: [PATCH 16/23] [FIX] httpd thread must be a daemon threaded bzr revid: chs@openerp.com-20140221215709-codb7b9r9n77ln7k --- openerp/service/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/service/server.py b/openerp/service/server.py index 5372459cd41..8d6e2c3246d 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -263,7 +263,9 @@ class ThreadedServer(CommonServer): self.httpd.serve_forever() def http_spawn(self): - threading.Thread(target=self.http_thread).start() + t = threading.Thread(target=self.http_thread, name="openerp.service.httpd") + t.setDaemon(True) + t.start() _logger.info('HTTP service (werkzeug) running on %s:%s', self.interface, self.port) def start(self): From 40f7df4fd80d88cbb29044584510a87e2670f511 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 21 Feb 2014 23:03:48 +0100 Subject: [PATCH 17/23] [FIX] return code is non-zero if any preloaded database failed to load bzr revid: chs@openerp.com-20140221220348-vw3mll25dti1n23u --- openerp/service/server.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/openerp/service/server.py b/openerp/service/server.py index 8d6e2c3246d..9eb29097a31 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -318,11 +318,11 @@ class ThreadedServer(CommonServer): """ self.start() - preload_registries(preload) + rc = preload_registries(preload) if stop: self.stop() - return + return rc # Wait for a first signal to be handled. (time.sleep will be interrupted @@ -583,11 +583,11 @@ class PreforkServer(CommonServer): def run(self, preload, stop): self.start() - preload_registries(preload) + rc = preload_registries(preload) if stop: self.stop() - return + return rc _logger.debug("Multiprocess starting") while 1: @@ -855,6 +855,7 @@ def preload_registries(dbnames): config = openerp.tools.config test_file = config['test_file'] dbnames = dbnames or [] + rc = 0 for dbname in dbnames: try: update_module = config['init'] or config['update'] @@ -866,9 +867,13 @@ def preload_registries(dbnames): load_test_file_yml(test_file) elif test_file.endswith('py'): load_test_file_py(test_file) + + if registry._assertion_report.failures: + rc += 1 except Exception: - _logger.exception('Failed to initialize database `%s`.', dbname) - return + _logger.critical('Failed to initialize database `%s`.', dbname, exc_info=True) + return -1 + return rc def start(preload=None, stop=False): """ Start the openerp http server and cron processor. From 9f3417080cf73c88eb2edbe8cdc9d80502bdb4de Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 21 Feb 2014 23:15:51 +0100 Subject: [PATCH 18/23] [FIX] correct run of test-file via command line bzr revid: chs@openerp.com-20140221221551-y168fe003k45229m --- openerp/service/server.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/openerp/service/server.py b/openerp/service/server.py index 9eb29097a31..699c7b25ed1 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -827,13 +827,12 @@ def _reexec(updated_modules=None): args.insert(0, exe) os.execv(sys.executable, args) -def load_test_file_yml(test_file): - cr = registry.db.cursor() - openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True) - cr.rollback() - cr.close() +def load_test_file_yml(registry, test_file): + with registry.cursor() as cr: + openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True) + cr.rollback() -def load_test_file_py(test_file): +def load_test_file_py(registry, test_file): # Locate python module based on its filename and run the tests test_path, _ = os.path.splitext(os.path.abspath(test_file)) for mod_name, mod_mod in sys.modules.items(): @@ -845,8 +844,9 @@ def load_test_file_py(test_file): suite.addTest(t) _logger.log(logging.INFO, 'running tests %s.', mod_mod.__name__) result = unittest2.TextTestRunner(verbosity=2, stream=openerp.modules.module.TestStream()).run(suite) - if not result.wasSuccessful(): - r = False + success = result.wasSuccessful() + registry._assertion_report.report_result(success) + if not success: _logger.error('%s: at least one error occurred in a test', test_file) def preload_registries(dbnames): @@ -864,9 +864,9 @@ def preload_registries(dbnames): if test_file: _logger.info('loading test file %s', test_file) if test_file.endswith('yml'): - load_test_file_yml(test_file) + load_test_file_yml(registry, test_file) elif test_file.endswith('py'): - load_test_file_py(test_file) + load_test_file_py(registry, test_file) if registry._assertion_report.failures: rc += 1 From f511109440e0e5cd43bd2e095182ef2f47d5e692 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 21 Feb 2014 23:17:02 +0100 Subject: [PATCH 19/23] [FIX] correct signal handler on nt bzr revid: chs@openerp.com-20140221221702-5sa98qfkfh0fimct --- openerp/service/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/service/server.py b/openerp/service/server.py index 699c7b25ed1..8df92ac8606 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -278,7 +278,7 @@ class ThreadedServer(CommonServer): signal.signal(signal.SIGQUIT, dumpstacks) elif os.name == 'nt': import win32api - win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1) + win32api.SetConsoleCtrlHandler(lambda sig: self.signal_handler(sig, None), 1) self.cron_spawn() self.http_spawn() From d81e9debbe93db70de75d15b14b1e17067f9811a Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 21 Feb 2014 23:35:44 +0100 Subject: [PATCH 20/23] [IMP] openerp/service/server.py: lint file bzr revid: chs@openerp.com-20140221223544-q309ioxit8tzlaki --- openerp/service/server.py | 73 ++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/openerp/service/server.py b/openerp/service/server.py index 8df92ac8606..339f4c35101 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -9,7 +9,6 @@ import os.path import platform import psutil import random -import re import resource import select import signal @@ -32,15 +31,14 @@ except ImportError: setproctitle = lambda x: None import openerp -import openerp.tools.config as config +from openerp.module.registry import RegistryManager from openerp.release import nt_service_name +import openerp.tools.config as config from openerp.tools.misc import stripped_sys_argv, dumpstacks -import wsgi_server - _logger = logging.getLogger(__name__) -SLEEP_INTERVAL = 60 # 1 min +SLEEP_INTERVAL = 60 # 1 min #---------------------------------------------------------- # Werkzeug WSGI servers patched @@ -126,7 +124,7 @@ class AutoReload(object): if len(right) < 2: continue module = right[0] - self.modules[module]=1 + self.modules[module] = 1 if self.modules: _logger.info('autoreload: xml change detected, autoreload activated') restart() @@ -146,7 +144,7 @@ class AutoReload(object): if py_errors: _logger.info('autoreload: python code change detected, errors found') for i in py_errors: - _logger.info('autoreload: SyntaxError %s',i) + _logger.info('autoreload: SyntaxError %s', i) else: _logger.info('autoreload: python code updated, autoreload activated') restart() @@ -213,7 +211,7 @@ class ThreadedServer(CommonServer): self.httpd = None def signal_handler(self, sig, frame): - if sig in [signal.SIGINT,signal.SIGTERM]: + if sig in [signal.SIGINT, signal.SIGTERM]: # shutdown on kill -INT or -TERM self.quit_signals_received += 1 if self.quit_signals_received > 1: @@ -227,7 +225,7 @@ class ThreadedServer(CommonServer): def cron_thread(self, number): while True: - time.sleep(SLEEP_INTERVAL + number) # Steve Reich timing style + time.sleep(SLEEP_INTERVAL + number) # Steve Reich timing style registries = openerp.modules.registry.RegistryManager.registries _logger.debug('cron%d polling for jobs', number) for db_name, registry in registries.items(): @@ -257,8 +255,8 @@ class ThreadedServer(CommonServer): _logger.debug("cron%d started!" % i) def http_thread(self): - def app(e,s): - return self.app(e,s) + def app(e, s): + return self.app(e, s) self.httpd = ThreadedWSGIServerReloadable(self.interface, self.port, app) self.httpd.serve_forever() @@ -324,7 +322,6 @@ class ThreadedServer(CommonServer): self.stop() return rc - # Wait for a first signal to be handled. (time.sleep will be interrupted # by the signal handler.) The try/except is for the win32 case. try: @@ -440,7 +437,7 @@ class PreforkServer(CommonServer): sys.exit(0) def long_polling_spawn(self): - nargs = stripped_sys_argv('--pidfile','--workers') + nargs = stripped_sys_argv('--pidfile', '--workers') cmd = nargs[0] cmd = os.path.join(os.path.dirname(cmd), "openerp-gevent") nargs[0] = cmd @@ -449,10 +446,10 @@ class PreforkServer(CommonServer): def worker_pop(self, pid): if pid in self.workers: - _logger.debug("Worker (%s) unregistered",pid) + _logger.debug("Worker (%s) unregistered", pid) try: - self.workers_http.pop(pid,None) - self.workers_cron.pop(pid,None) + self.workers_http.pop(pid, None) + self.workers_cron.pop(pid, None) u = self.workers.pop(pid) u.close() except OSError: @@ -468,7 +465,7 @@ class PreforkServer(CommonServer): def process_signals(self): while len(self.queue): sig = self.queue.pop(0) - if sig in [signal.SIGINT,signal.SIGTERM]: + if sig in [signal.SIGINT, signal.SIGTERM]: raise KeyboardInterrupt elif sig == signal.SIGHUP: # restart on kill -HUP @@ -504,8 +501,8 @@ class PreforkServer(CommonServer): def process_timeout(self): now = time.time() for (pid, worker) in self.workers.items(): - if (worker.watchdog_timeout is not None) and \ - (now - worker.watchdog_time >= worker.watchdog_timeout): + if worker.watchdog_timeout is not None and \ + (now - worker.watchdog_time) >= worker.watchdog_timeout: _logger.error("Worker (%s) timeout", pid) self.worker_kill(pid, signal.SIGKILL) @@ -520,7 +517,7 @@ class PreforkServer(CommonServer): def sleep(self): try: # map of fd -> worker - fds = dict([(w.watchdog_pipe[0],w) for k,w in self.workers.items()]) + fds = dict([(w.watchdog_pipe[0], w) for k, w in self.workers.items()]) fd_in = fds.keys() + [self.pipe[0]] # check for ping or internal wakeups ready = select.select(fd_in, [], [], self.beat) @@ -560,11 +557,12 @@ class PreforkServer(CommonServer): self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.socket.setblocking(0) self.socket.bind(self.address) - self.socket.listen(8*self.population) + self.socket.listen(8 * self.population) def stop(self, graceful=True): if self.long_polling_pid is not None: - self.worker_kill(self.long_polling_pid, signal.SIGKILL) # FIXME make longpolling process handle SIGTERM correctly + # FIXME make longpolling process handle SIGTERM correctly + self.worker_kill(self.long_polling_pid, signal.SIGKILL) self.long_polling_pid = None if graceful: _logger.info("Stopping gracefully") @@ -602,7 +600,7 @@ class PreforkServer(CommonServer): _logger.debug("Multiprocess clean stop") self.stop() break - except Exception,e: + except Exception, e: _logger.exception(e) self.stop(False) return -1 @@ -634,7 +632,7 @@ class Worker(object): def sleep(self): try: - ret = select.select([self.multi.socket], [], [], self.multi.beat) + select.select([self.multi.socket], [], [], self.multi.beat) except select.error, e: if e[0] not in [errno.EINTR]: raise @@ -652,7 +650,7 @@ class Worker(object): rss, vms = psutil.Process(os.getpid()).get_memory_info() if vms > config['limit_memory_soft']: _logger.info('Worker (%d) virtual memory limit (%s) reached.', self.pid, vms) - self.alive = False # Commit suicide after the request. + self.alive = False # Commit suicide after the request. # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space soft, hard = resource.getrlimit(resource.RLIMIT_AS) @@ -700,7 +698,7 @@ class Worker(object): self.process_work() _logger.info("Worker (%s) exiting. request_count: %s.", self.pid, self.request_count) self.stop() - except Exception,e: + except Exception: _logger.exception("Worker (%s) Exception occured, exiting..." % self.pid) # should we use 3 to abort everything ? sys.exit(1) @@ -718,7 +716,7 @@ class WorkerHTTP(Worker): # tolerate broken pipe when the http client closes the socket before # receiving the full reply try: - self.server.process_request(client,addr) + self.server.process_request(client, addr) except IOError, e: if e.errno != errno.EPIPE: raise @@ -749,7 +747,7 @@ class WorkerCron(Worker): def sleep(self): # Really sleep once all the databases have been processed. if self.db_index == 0: - interval = SLEEP_INTERVAL + self.pid % 10 # chorus effect + interval = SLEEP_INTERVAL + self.pid % 10 # chorus effect time.sleep(interval) def _db_list(self): @@ -771,7 +769,7 @@ class WorkerCron(Worker): if rpc_request_flag: start_time = time.time() start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info() - + import openerp.addons.base as base base.ir.ir_cron.ir_cron._acquire_job(db_name) openerp.modules.registry.RegistryManager.delete(db_name) @@ -780,16 +778,18 @@ class WorkerCron(Worker): if len(db_names) > 1: openerp.sql_db.close_db(db_name) if rpc_request_flag: - end_time = time.time() + run_time = time.time() - start_time end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info() - logline = '%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (db_name, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024) + vms_diff = (end_vms - start_vms) / 1024 + logline = '%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % \ + (db_name, run_time, start_vms / 1024, end_vms / 1024, vms_diff) _logger.debug("WorkerCron (%s) %s", self.pid, logline) self.request_count += 1 if self.request_count >= self.request_max and self.request_max < len(db_names): _logger.error("There are more dabatases to process than allowed " - "by the `limit_request` configuration variable: %s more.", - len(db_names) - self.request_max) + "by the `limit_request` configuration variable: %s more.", + len(db_names) - self.request_max) else: self.db_index = 0 @@ -822,7 +822,7 @@ def _reexec(updated_modules=None): subprocess.call('net stop {0} && net start {0}'.format(nt_service_name), shell=True) exe = os.path.basename(sys.executable) args = stripped_sys_argv() - args += ["-u", ','.join(updated_modules)] + args += ["-u", ','.join(updated_modules)] if not args or args[0] != exe: args.insert(0, exe) os.execv(sys.executable, args) @@ -843,7 +843,8 @@ def load_test_file_py(registry, test_file): for t in unittest2.TestLoader().loadTestsFromModule(mod_mod): suite.addTest(t) _logger.log(logging.INFO, 'running tests %s.', mod_mod.__name__) - result = unittest2.TextTestRunner(verbosity=2, stream=openerp.modules.module.TestStream()).run(suite) + stream = openerp.modules.module.TestStream() + result = unittest2.TextTestRunner(verbosity=2, stream=stream).run(suite) success = result.wasSuccessful() registry._assertion_report.report_result(success) if not success: @@ -859,7 +860,7 @@ def preload_registries(dbnames): for dbname in dbnames: try: update_module = config['init'] or config['update'] - registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module) + registry = RegistryManager.new(dbname, update_module=update_module) # run test_file if provided if test_file: _logger.info('loading test file %s', test_file) From e027b3b44758079d78d9dcd7a98d35c0b017438d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Sat, 22 Feb 2014 00:10:10 +0100 Subject: [PATCH 21/23] [FIX] damn! correct import bzr revid: chs@openerp.com-20140221231010-nxwqfgtn6477ewvg --- openerp/service/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/service/server.py b/openerp/service/server.py index 339f4c35101..ec78aac86a9 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -31,7 +31,7 @@ except ImportError: setproctitle = lambda x: None import openerp -from openerp.module.registry import RegistryManager +from openerp.modules.registry import RegistryManager from openerp.release import nt_service_name import openerp.tools.config as config from openerp.tools.misc import stripped_sys_argv, dumpstacks From 5580324bbf830734cf844f9b0553ec6541bf0c04 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sun, 23 Feb 2014 07:07:06 +0000 Subject: [PATCH 22/23] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140222063856-jg0p4f82hy0yw5f0 bzr revid: launchpad_translations_on_behalf_of_openerp-20140222063912-upicgao9ly9iu2wf bzr revid: launchpad_translations_on_behalf_of_openerp-20140223070706-qx82kgcpxvuqfmod --- .../analytic_contract_hr_expense/i18n/ja.po | 4 +- addons/portal_project/i18n/fi.po | 37 +++++ addons/portal_project_issue/i18n/fi.po | 47 ++++++ addons/product_expiry/i18n/am.po | 149 ++++++++++++++++++ openerp/addons/base/i18n/ab.po | 4 +- openerp/addons/base/i18n/af.po | 4 +- openerp/addons/base/i18n/am.po | 4 +- openerp/addons/base/i18n/ar.po | 4 +- openerp/addons/base/i18n/bg.po | 4 +- openerp/addons/base/i18n/bn.po | 4 +- openerp/addons/base/i18n/bs.po | 4 +- openerp/addons/base/i18n/ca.po | 4 +- openerp/addons/base/i18n/cs.po | 4 +- openerp/addons/base/i18n/da.po | 4 +- openerp/addons/base/i18n/de.po | 4 +- openerp/addons/base/i18n/el.po | 4 +- openerp/addons/base/i18n/en_GB.po | 4 +- openerp/addons/base/i18n/es.po | 4 +- openerp/addons/base/i18n/es_AR.po | 4 +- openerp/addons/base/i18n/es_BO.po | 4 +- openerp/addons/base/i18n/es_CL.po | 4 +- openerp/addons/base/i18n/es_CR.po | 4 +- openerp/addons/base/i18n/es_DO.po | 4 +- openerp/addons/base/i18n/es_EC.po | 4 +- openerp/addons/base/i18n/es_MX.po | 4 +- openerp/addons/base/i18n/es_PE.po | 4 +- openerp/addons/base/i18n/es_VE.po | 4 +- openerp/addons/base/i18n/et.po | 4 +- openerp/addons/base/i18n/eu.po | 4 +- openerp/addons/base/i18n/fa.po | 4 +- openerp/addons/base/i18n/fa_AF.po | 4 +- openerp/addons/base/i18n/fi.po | 18 +-- openerp/addons/base/i18n/fr.po | 4 +- openerp/addons/base/i18n/fr_CA.po | 4 +- openerp/addons/base/i18n/gl.po | 4 +- openerp/addons/base/i18n/gu.po | 4 +- openerp/addons/base/i18n/he.po | 4 +- openerp/addons/base/i18n/hi.po | 4 +- openerp/addons/base/i18n/hr.po | 4 +- openerp/addons/base/i18n/hu.po | 4 +- openerp/addons/base/i18n/hy.po | 4 +- openerp/addons/base/i18n/id.po | 4 +- openerp/addons/base/i18n/is.po | 4 +- openerp/addons/base/i18n/it.po | 4 +- openerp/addons/base/i18n/ja.po | 26 ++- openerp/addons/base/i18n/ka.po | 4 +- openerp/addons/base/i18n/kk.po | 4 +- openerp/addons/base/i18n/ko.po | 4 +- openerp/addons/base/i18n/lt.po | 4 +- openerp/addons/base/i18n/lv.po | 4 +- openerp/addons/base/i18n/mk.po | 4 +- openerp/addons/base/i18n/mn.po | 4 +- openerp/addons/base/i18n/nb.po | 4 +- openerp/addons/base/i18n/nl.po | 4 +- openerp/addons/base/i18n/nl_BE.po | 4 +- openerp/addons/base/i18n/pl.po | 4 +- openerp/addons/base/i18n/pt.po | 4 +- openerp/addons/base/i18n/pt_BR.po | 4 +- openerp/addons/base/i18n/ro.po | 4 +- openerp/addons/base/i18n/ru.po | 4 +- openerp/addons/base/i18n/sk.po | 4 +- openerp/addons/base/i18n/sl.po | 4 +- openerp/addons/base/i18n/sq.po | 4 +- openerp/addons/base/i18n/sr.po | 4 +- openerp/addons/base/i18n/sr@latin.po | 4 +- openerp/addons/base/i18n/sv.po | 4 +- openerp/addons/base/i18n/th.po | 4 +- openerp/addons/base/i18n/tlh.po | 4 +- openerp/addons/base/i18n/tr.po | 4 +- openerp/addons/base/i18n/uk.po | 4 +- openerp/addons/base/i18n/ur.po | 4 +- openerp/addons/base/i18n/vi.po | 4 +- openerp/addons/base/i18n/zh_CN.po | 4 +- openerp/addons/base/i18n/zh_HK.po | 4 +- openerp/addons/base/i18n/zh_TW.po | 4 +- 75 files changed, 404 insertions(+), 153 deletions(-) create mode 100644 addons/portal_project/i18n/fi.po create mode 100644 addons/portal_project_issue/i18n/fi.po create mode 100644 addons/product_expiry/i18n/am.po diff --git a/addons/analytic_contract_hr_expense/i18n/ja.po b/addons/analytic_contract_hr_expense/i18n/ja.po index 2f2b5c3dd6a..3be80b97079 100644 --- a/addons/analytic_contract_hr_expense/i18n/ja.po +++ b/addons/analytic_contract_hr_expense/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:39+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: analytic_contract_hr_expense #: view:account.analytic.account:0 diff --git a/addons/portal_project/i18n/fi.po b/addons/portal_project/i18n/fi.po new file mode 100644 index 00000000000..3d84cb911de --- /dev/null +++ b/addons/portal_project/i18n/fi.po @@ -0,0 +1,37 @@ +# Finnish 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: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2014-02-22 20:02+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \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:07+0000\n" +"X-Generator: Launchpad (build 16926)\n" + +#. module: portal_project +#: model:ir.actions.act_window,help:portal_project.open_view_project +msgid "" +"

    \n" +" Click to start a new project.\n" +"

    \n" +" " +msgstr "" +"

    \n" +" Klikkaa aloittaaksesi uuden projektin.\n" +"

    \n" +" " + +#. module: portal_project +#: model:ir.actions.act_window,name:portal_project.open_view_project +#: model:ir.ui.menu,name:portal_project.portal_services_projects +msgid "Projects" +msgstr "Projektit" diff --git a/addons/portal_project_issue/i18n/fi.po b/addons/portal_project_issue/i18n/fi.po new file mode 100644 index 00000000000..d18d7c113b2 --- /dev/null +++ b/addons/portal_project_issue/i18n/fi.po @@ -0,0 +1,47 @@ +# Finnish 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: 2012-12-21 17:06+0000\n" +"PO-Revision-Date: 2014-02-22 20:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \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:07+0000\n" +"X-Generator: Launchpad (build 16926)\n" + +#. module: portal_project_issue +#: view:project.issue:0 +msgid "Creation:" +msgstr "Luonti:" + +#. module: portal_project_issue +#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0 +msgid "" +"

    \n" +" Click to create an issue.\n" +"

    \n" +" You can track your issues from this menu and the action we\n" +" will take.\n" +"

    \n" +" " +msgstr "" +"

    \n" +" Klikkaa luodaksesi palautteen.\n" +"

    \n" +" Voit seurata palautteitasi ja niiden\n" +" etenemistä tästä valikosta.\n" +"

    \n" +" " + +#. module: portal_project_issue +#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0 +msgid "Issues" +msgstr "Ilmoitukset" diff --git a/addons/product_expiry/i18n/am.po b/addons/product_expiry/i18n/am.po new file mode 100644 index 00000000000..d165d4ba279 --- /dev/null +++ b/addons/product_expiry/i18n/am.po @@ -0,0 +1,149 @@ +# Amharic 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: 2012-12-21 17:06+0000\n" +"PO-Revision-Date: 2014-02-21 11:53+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Amharic \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 06:39+0000\n" +"X-Generator: Launchpad (build 16926)\n" + +#. module: product_expiry +#: model:product.template,name:product_expiry.product_product_from_product_template +msgid "Ham" +msgstr "" + +#. module: product_expiry +#: model:product.template,name:product_expiry.product_product_lait_product_template +msgid "Cow milk" +msgstr "" + +#. module: product_expiry +#: field:product.product,life_time:0 +msgid "Product Life Time" +msgstr "የእቃው የመቆያ ግዜ" + +#. module: product_expiry +#: help:stock.production.lot,removal_date:0 +msgid "" +"This is the date on which the goods with this Serial Number should be " +"removed from the stock." +msgstr "" + +#. module: product_expiry +#: help:product.product,removal_time:0 +msgid "" +"When a new a Serial Number is issued, this is the number of days before the " +"goods should be removed from the stock." +msgstr "" + +#. module: product_expiry +#: field:product.product,use_time:0 +msgid "Product Use Time" +msgstr "የእቃው መጠቀምያ ግዜ" + +#. module: product_expiry +#: model:ir.model,name:product_expiry.model_product_product +msgid "Product" +msgstr "እቃ" + +#. module: product_expiry +#: help:product.product,use_time:0 +msgid "" +"When a new a Serial Number is issued, this is the number of days before the " +"goods starts deteriorating, without being dangerous yet." +msgstr "" + +#. module: product_expiry +#: field:product.product,removal_time:0 +msgid "Product Removal Time" +msgstr "የእቃው የሚወገድበት ግዜ" + +#. module: product_expiry +#: help:stock.production.lot,alert_date:0 +msgid "" +"This is the date on which an alert should be notified about the goods with " +"this Serial Number." +msgstr "" + +#. module: product_expiry +#: model:ir.model,name:product_expiry.model_stock_production_lot +msgid "Serial Number" +msgstr "መለያ ቁጥር" + +#. module: product_expiry +#: help:product.product,alert_time:0 +msgid "" +"When a new a Serial Number is issued, this is the number of days before an " +"alert should be notified." +msgstr "" + +#. module: product_expiry +#: field:stock.production.lot,removal_date:0 +msgid "Removal Date" +msgstr "የሚወገድበት ቀን" + +#. module: product_expiry +#: model:product.template,name:product_expiry.product_product_pain_product_template +msgid "Bread" +msgstr "" + +#. module: product_expiry +#: view:product.product:0 +msgid "Dates" +msgstr "" + +#. module: product_expiry +#: field:stock.production.lot,life_date:0 +msgid "End of Life Date" +msgstr "የመጨረሻው ቀን" + +#. module: product_expiry +#: field:stock.production.lot,use_date:0 +msgid "Best before Date" +msgstr "ያለፍ ጥሩ ቀናቶች" + +#. module: product_expiry +#: model:product.template,name:product_expiry.product_product_jambon_product_template +msgid "French cheese Camenbert" +msgstr "" + +#. module: product_expiry +#: help:product.product,life_time:0 +msgid "" +"When a new a Serial Number is issued, this is the number of days before the " +"goods may become dangerous and must not be consumed." +msgstr "" + +#. module: product_expiry +#: field:stock.production.lot,alert_date:0 +msgid "Alert Date" +msgstr "ማሳወቅያ ቀን" + +#. module: product_expiry +#: help:stock.production.lot,use_date:0 +msgid "" +"This is the date on which the goods with this Serial Number start " +"deteriorating, without being dangerous yet." +msgstr "" + +#. module: product_expiry +#: help:stock.production.lot,life_date:0 +msgid "" +"This is the date on which the goods with this Serial Number may become " +"dangerous and must not be consumed." +msgstr "" + +#. module: product_expiry +#: field:product.product,alert_time:0 +msgid "Product Alert Time" +msgstr "እቃውን የማሳወቅያ ግዜ" diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po index 7dfa69f0083..1ba79c773ab 100644 --- a/openerp/addons/base/i18n/ab.po +++ b/openerp/addons/base/i18n/ab.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:32+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:21+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index 5b295dc2bcd..bd878c88ab3 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:32+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po index e3894d9bc14..4ace71b27a2 100644 --- a/openerp/addons/base/i18n/am.po +++ b/openerp/addons/base/i18n/am.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po index 3c37c5afe93..f2b1d19a845 100644 --- a/openerp/addons/base/i18n/ar.po +++ b/openerp/addons/base/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po index 05e12422635..fb924a71ee6 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:34+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po index 6d91016de62..dcf88ca7472 100644 --- a/openerp/addons/base/i18n/bn.po +++ b/openerp/addons/base/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:34+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po index 0e806d0408b..8bed1953e5e 100644 --- a/openerp/addons/base/i18n/bs.po +++ b/openerp/addons/base/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:34+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po index f262fe3ed8d..f2ebada45af 100644 --- a/openerp/addons/base/i18n/ca.po +++ b/openerp/addons/base/i18n/ca.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:35+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index 74fb7b939dc..b5287f5e5cf 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:35+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n" +"X-Generator: Launchpad (build 16926)\n" "X-Poedit-Language: Czech\n" #. module: base diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po index fdd4121f77b..c6896676db7 100644 --- a/openerp/addons/base/i18n/da.po +++ b/openerp/addons/base/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:35+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index 4c9d52d776b..b7edb6538d3 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po index 3235391d7a1..4e3ca231f5a 100644 --- a/openerp/addons/base/i18n/el.po +++ b/openerp/addons/base/i18n/el.po @@ -12,8 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n" +"X-Generator: Launchpad (build 16926)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po index 19199e3984f..2d994f939da 100644 --- a/openerp/addons/base/i18n/en_GB.po +++ b/openerp/addons/base/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po index 94dd68dd4fb..1742dcd47b4 100644 --- a/openerp/addons/base/i18n/es.po +++ b/openerp/addons/base/i18n/es.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:43+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po index 5dc6f4ff6f1..566df655074 100644 --- a/openerp/addons/base/i18n/es_AR.po +++ b/openerp/addons/base/i18n/es_AR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:45+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po index 01752c54c0c..31a6b94f4a3 100644 --- a/openerp/addons/base/i18n/es_BO.po +++ b/openerp/addons/base/i18n/es_BO.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:47+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index 92f2f2fb43e..f9fcdca13d4 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po index 5a6c3036f2c..11a0d4a251e 100644 --- a/openerp/addons/base/i18n/es_CR.po +++ b/openerp/addons/base/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:47+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n" +"X-Generator: Launchpad (build 16926)\n" "Language: \n" #. module: base diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po index 66c6c7dec57..ea34722c84f 100644 --- a/openerp/addons/base/i18n/es_DO.po +++ b/openerp/addons/base/i18n/es_DO.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po index ee6e0f006bd..186faa9b581 100644 --- a/openerp/addons/base/i18n/es_EC.po +++ b/openerp/addons/base/i18n/es_EC.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:48+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po index 6dbee6f72f5..d89de25fdd9 100644 --- a/openerp/addons/base/i18n/es_MX.po +++ b/openerp/addons/base/i18n/es_MX.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:48+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po index 5c582182184..a6f2ee68a72 100644 --- a/openerp/addons/base/i18n/es_PE.po +++ b/openerp/addons/base/i18n/es_PE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:48+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po index c77bb1d8597..d7e904151fb 100644 --- a/openerp/addons/base/i18n/es_VE.po +++ b/openerp/addons/base/i18n/es_VE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:45+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po index 2d49cc78eda..4c01f795065 100644 --- a/openerp/addons/base/i18n/et.po +++ b/openerp/addons/base/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:35+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po index f2e9b88d7f1..0be7283054d 100644 --- a/openerp/addons/base/i18n/eu.po +++ b/openerp/addons/base/i18n/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po index b322c074c5f..8e74b1763f3 100644 --- a/openerp/addons/base/i18n/fa.po +++ b/openerp/addons/base/i18n/fa.po @@ -9,8 +9,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:41+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:30+0000\n" +"X-Generator: Launchpad (build 16926)\n" "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" "X-Poedit-Language: Persian\n" diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po index 06d57f17ed5..71f3a3149b4 100644 --- a/openerp/addons/base/i18n/fa_AF.po +++ b/openerp/addons/base/i18n/fa_AF.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:49+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po index 9884ef8b1ff..baf411092bc 100644 --- a/openerp/addons/base/i18n/fi.po +++ b/openerp/addons/base/i18n/fi.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:36+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -25,7 +25,7 @@ msgid "" " " msgstr "" "\n" -"Moduuli Šekkien kirjoittamisen ja tulostamiseen.\n" +"Moduuli Shekkien kirjoittamisen ja tulostamiseen.\n" "===========================================\n" " " @@ -129,7 +129,7 @@ msgstr "" "Moduuli joka lisää valmistajat ja ominaisuudet tuotelomakkeelle.\n" "=========================================================\n" "\n" -"Voit net määritellä tuotteelle seuraavat tiedot:\n" +"Voit nyt määritellä tuotteelle seuraavat tiedot:\n" "---------------------------------------------------------\n" " * Valmistaja\n" " * Valmistajan tuotenimi\n" @@ -688,7 +688,7 @@ msgstr "Palau" #. module: base #: view:res.partner:0 msgid "Sales & Purchases" -msgstr "Myynti ja hankinta" +msgstr "Myynnit & Ostot" #. module: base #: view:ir.translation:0 @@ -3836,7 +3836,7 @@ msgstr "Raportointi" #: field:res.partner,title:0 #: field:res.partner.title,name:0 msgid "Title" -msgstr "Yhtiömuoto" +msgstr "Titteli" #. module: base #: help:ir.property,res_id:0 @@ -10138,7 +10138,7 @@ msgstr "" #: view:res.groups:0 #: field:res.partner,comment:0 msgid "Notes" -msgstr "Huomautukset" +msgstr "Muistiinpanot" #. module: base #: field:ir.config_parameter,value:0 @@ -15482,7 +15482,7 @@ msgstr "Matkapuhelinnumero" #: model:ir.model,name:base.model_res_partner_category #: view:res.partner.category:0 msgid "Partner Categories" -msgstr "Kumppanien ryhmät" +msgstr "Kumppaniryhmät" #. module: base #: view:base.module.upgrade:0 @@ -15690,7 +15690,7 @@ msgstr "" #. module: base #: view:res.partner:0 msgid "Internal Notes" -msgstr "Sisäiset huomautukset" +msgstr "Sisäiset muistiinpanot" #. module: base #: model:res.partner.title,name:base.res_partner_title_pvt_ltd diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index 7b2512d903e..5c779ab7aa9 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:36+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po index 780bc801f39..73af473040b 100644 --- a/openerp/addons/base/i18n/fr_CA.po +++ b/openerp/addons/base/i18n/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po index f0708a9968f..deab7d8a675 100644 --- a/openerp/addons/base/i18n/gl.po +++ b/openerp/addons/base/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po index a663cc2336f..c12e8215468 100644 --- a/openerp/addons/base/i18n/gu.po +++ b/openerp/addons/base/i18n/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po index 546bd34144e..3b59cc71343 100644 --- a/openerp/addons/base/i18n/he.po +++ b/openerp/addons/base/i18n/he.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po index fdb6f8a7733..854c1445870 100644 --- a/openerp/addons/base/i18n/hi.po +++ b/openerp/addons/base/i18n/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:38+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po index 0b634c571a8..5879a1a5096 100644 --- a/openerp/addons/base/i18n/hr.po +++ b/openerp/addons/base/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:32+0000\n" +"X-Generator: Launchpad (build 16926)\n" "Language: hr\n" #. module: base diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po index 91c34ae6657..a2b2b32d75b 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/i18n/hu.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:38+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po index b7cd2bb6b60..6a2b22db2f4 100644 --- a/openerp/addons/base/i18n/hy.po +++ b/openerp/addons/base/i18n/hy.po @@ -9,8 +9,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index dc136feb360..92763eb1b10 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:38+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po index 8f82dae30ee..693c2c845ef 100644 --- a/openerp/addons/base/i18n/is.po +++ b/openerp/addons/base/i18n/is.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:38+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po index af28660269a..f99d805b221 100644 --- a/openerp/addons/base/i18n/it.po +++ b/openerp/addons/base/i18n/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index abca6dce0dd..7acfaa75b85 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -2295,7 +2295,7 @@ msgstr "メソッド" #. module: base #: model:ir.module.module,shortdesc:base.module_auth_crypt msgid "Password Encryption" -msgstr "" +msgstr "パスワード暗号化" #. module: base #: view:workflow.activity:0 @@ -8016,6 +8016,12 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" クリックしてアドレス帳に連絡先を追加してください。\n" +"

    \n" +" OpenERPは顧客、ディスカッション、商機の履歴、文書など関連するすべての活動の追跡を容易にします。\n" +"

    \n" +" " #. module: base #: model:ir.actions.act_window,name:base.bank_account_update @@ -9789,7 +9795,7 @@ msgstr "ドイツ" #. module: base #: model:ir.module.module,shortdesc:base.module_auth_oauth msgid "OAuth2 Authentication" -msgstr "" +msgstr "OAuth2認証" #. module: base #: view:workflow:0 @@ -10032,6 +10038,12 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" クリックしてアドレス帳に連絡先を追加してください。\n" +"

    \n" +" OpenERPは仕入先、ディスカッション、購入の履歴、文書など関連するすべての活動の追跡を容易にします。\n" +"

    \n" +" " #. module: base #: model:res.country,name:base.lr @@ -15563,6 +15575,12 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" クリックしてアドレス帳に連絡先を追加してください。\n" +"

    \n" +" OpenERPは顧客、ディスカッション、商機の履歴、文書など関連するすべての活動の追跡を容易にします。\n" +"

    \n" +" " #. module: base #: model:res.partner.category,name:base.res_partner_category_2 diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po index 23febc50180..a07e569fc58 100644 --- a/openerp/addons/base/i18n/ka.po +++ b/openerp/addons/base/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:36+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po index be14353dbbb..fd1401f3b2f 100644 --- a/openerp/addons/base/i18n/kk.po +++ b/openerp/addons/base/i18n/kk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index 7f8a6294d67..68a67e8dd50 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po index 41bf6184d54..860fd218a82 100644 --- a/openerp/addons/base/i18n/lt.po +++ b/openerp/addons/base/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:40+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po index 2dffa10010b..7267dd928f4 100644 --- a/openerp/addons/base/i18n/lv.po +++ b/openerp/addons/base/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po index 959625eb326..ca43ebc0830 100644 --- a/openerp/addons/base/i18n/mk.po +++ b/openerp/addons/base/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:40+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po index 0a7fdda48bb..2399a1f42fb 100644 --- a/openerp/addons/base/i18n/mn.po +++ b/openerp/addons/base/i18n/mn.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:40+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index fa284c499cc..24238f3930a 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:40+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 437b1573219..262497dc979 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:35+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index 68516ab59e0..f8fd7bf1233 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:47+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index 153b4e2d6e4..743a7aa0584 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:41+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:30+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index ccc2c104bda..0b8bb5e0298 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:41+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:30+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index cb4d741324a..005ec2713fe 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:45+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index e7e599f738f..e9a77c2cb6a 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index 78a9fc009d3..59cab185b27 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po index cf4d85d449d..a4cb967cdbb 100644 --- a/openerp/addons/base/i18n/sk.po +++ b/openerp/addons/base/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:32+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index a8875055ba1..f86dbc72f64 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:43+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:32+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po index 1944d14c787..9fb318a5422 100644 --- a/openerp/addons/base/i18n/sq.po +++ b/openerp/addons/base/i18n/sq.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po index 64353f30337..7bae2e9c48a 100644 --- a/openerp/addons/base/i18n/sr.po +++ b/openerp/addons/base/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po index f816a58a2f4..f307be9e8b0 100644 --- a/openerp/addons/base/i18n/sr@latin.po +++ b/openerp/addons/base/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:49+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po index 901f0879025..765f5a23578 100644 --- a/openerp/addons/base/i18n/sv.po +++ b/openerp/addons/base/i18n/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:43+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po index 9bfa5e24012..afd43cf2210 100644 --- a/openerp/addons/base/i18n/th.po +++ b/openerp/addons/base/i18n/th.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:43+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index a5ec6474b4a..877e3c9c0ce 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:43+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index 49f4b9beda2..e18e16a8b2e 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po index 9820330aa71..a4c380e217e 100644 --- a/openerp/addons/base/i18n/uk.po +++ b/openerp/addons/base/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po index 56aeeaac51e..0907705cd6c 100644 --- a/openerp/addons/base/i18n/ur.po +++ b/openerp/addons/base/i18n/ur.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po index 0d0344feb28..a88ebdc9981 100644 --- a/openerp/addons/base/i18n/vi.po +++ b/openerp/addons/base/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po index 8ae359ba3ae..e6dc69d2355 100644 --- a/openerp/addons/base/i18n/zh_CN.po +++ b/openerp/addons/base/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:48+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po index 37770edda37..0d10f810bb9 100644 --- a/openerp/addons/base/i18n/zh_HK.po +++ b/openerp/addons/base/i18n/zh_HK.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po index 47f285186dc..0b50ad3e1d8 100644 --- a/openerp/addons/base/i18n/zh_TW.po +++ b/openerp/addons/base/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-14 06:47+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n" +"X-Generator: Launchpad (build 16926)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing From 3e31d2cb03df69a92b90a7b2b717eaef0f92387e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 24 Feb 2014 10:55:53 +0100 Subject: [PATCH 23/23] [IMP] Allow to press select where you want the new line bzr revid: fp@tinyerp.com-20140224095553-qc4lhnpetczl1t7v --- addons/website/views/snippets.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 50d5d8e616c..968d4683449 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -688,22 +688,22 @@

    First Feature

    -

    Tell what's the value for the customer for this feature.

    +
    Tell what's the value for the customer for this feature.

    Second Feature

    -

    Write what the customer would like to know, not what you want to show.

    +
    Write what the customer would like to know, not what you want to show.

    Third Feature

    -

    A small explanation of this great feature, in clear words.

    +
    A small explanation of this great feature, in clear words.

    Fourth Feature

    -

    A small explanation of this great feature on two lines.

    +
    A small explanation of this great feature on two lines.