odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]sync with trunk. 

bzr revid: dka@tinyerp.com-20140224101844-2k8p1j86ngybtvw4
This commit is contained in:
Darshan Kalola (OpenERP) 2014-02-24 15:48:44 +05:30
parent 8bf832b259 3e31d2cb03
commit 068c1be14c
19 changed files with 401 additions and 1779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
addons/analytic_contract_hr_expense/i18n/ja.po Normal file
View File

@ -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 <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
"Language-Team: Japanese <ja@li.org>\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: 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 "⇒ 請求"

5
addons/crm/crm_lead_data.xml
View File

@ -146,6 +146,7 @@
<!-- CRM-related subtypes for messaging / Chatter -->
<record id="mt_lead_create" model="mail.message.subtype">
<field name="name">Lead Created</field>
<field name="hidden" eval="True"/>
<field name="res_model">crm.lead</field>
<field name="default" eval="False"/>
<field name="description">Lead created</field>
@ -171,6 +172,7 @@
<!-- Salesteam-related subtypes for messaging / Chatter -->
<record id="mt_salesteam_lead" model="mail.message.subtype">
<field name="name">Lead Created</field>
<field name="sequence">10</field>
<field name="res_model">crm.case.section</field>
<field name="default" eval="False"/>
<field name="parent_id" eval="ref('mt_lead_create')"/>
@ -178,18 +180,21 @@
</record>
<record id="mt_salesteam_lead_stage" model="mail.message.subtype">
<field name="name">Opportunity Stage Changed</field>
<field name="sequence">11</field>
<field name="res_model">crm.case.section</field>
<field name="parent_id" eval="ref('mt_lead_stage')"/>
<field name="relation_field">section_id</field>
</record>
<record id="mt_salesteam_lead_won" model="mail.message.subtype">
<field name="name">Opportunity Won</field>
<field name="sequence">12</field>
<field name="res_model">crm.case.section</field>
<field name="parent_id" eval="ref('mt_lead_won')"/>
<field name="relation_field">section_id</field>
</record>
<record id="mt_salesteam_lead_lost" model="mail.message.subtype">
<field name="name">Opportunity Lost</field>
<field name="sequence">13</field>
<field name="res_model">crm.case.section</field>
<field name="default" eval="False"/>
<field name="parent_id" eval="ref('mt_lead_lost')"/>

1733
addons/gamification/i18n.moved/gamification.pot
View File

File diff suppressed because it is too large Load Diff

30
addons/hr_recruitment/i18n/zh_CN.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <jeff@osbzr.com>\n"
"PO-Revision-Date: 2014-02-20 15:53+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\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

28
addons/hr_timesheet_sheet/i18n/zh_CN.po
View File

@ -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 <ccdos@intoerp.com>\n"
"PO-Revision-Date: 2014-02-20 15:57+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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

1
addons/mail/data/mail_data.xml
View File

@ -54,6 +54,7 @@
<!-- Discussion subtype for messaging / Chatter -->
<record id="mt_comment" model="mail.message.subtype">
<field name="name">Discussions</field>
<field name="sequence" eval="0"/>
</record>
</data>
</openerp>

6
addons/mail/mail_message_subtype.py
View File

@ -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, '\
@ -50,7 +52,11 @@ 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', help="Used to order subtypes."),
'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options")
}
_defaults = {
'default': True,
'sequence': 1,
}

19
addons/mail/mail_message_subtype.xml
View File

@ -9,6 +9,7 @@
<field name="arch" type="xml">
<tree string="Subtype">
<field name="name"/>
<field name="sequence"/>
<field name="res_model"/>
<field name="default"/>
</tree>
@ -22,12 +23,18 @@
<form string="Email message" version="7.0">
<sheet>
<group>
<field name="name"/>
<field name="res_model"/>
<field name="default"/>
<field name="description"/>
<field name="parent_id"/>
<field name="relation_field"/>
<group string='Description'>
<field name="name"/>
<field name="sequence"/>
<field name="res_model"/>
<field name="description"/>
<field name="default"/>
<field name="hidden"/>
</group>
<group string='Auto subscription'>
<field name="parent_id"/>
<field name="relation_field"/>
</group>
</group>
</sheet>
</form>

19
addons/mail/mail_thread.py
View File

@ -20,6 +20,7 @@
##############################################################################
import base64
from collections import OrderedDict
import datetime
import dateutil
import email
@ -185,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 = 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_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()
@ -1580,10 +1590,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:

4
addons/mail/static/src/css/mail.css
View File

@ -760,4 +760,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;
}

8
addons/mail/static/src/js/mail_followers.js
View File

@ -270,7 +270,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, 'dialog': dialog})).appendTo($list);

37
addons/portal_project/i18n/fi.po Normal file
View File

@ -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 <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
"Language-Team: Finnish <fi@li.org>\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 ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to start a new project.\n"
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Klikkaa aloittaaksesi uuden projektin.\n"
" </p>\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"

47
addons/portal_project_issue/i18n/fi.po Normal file
View File

@ -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 <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
"Language-Team: Finnish <fi@li.org>\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 ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create an issue.\n"
" </p><p>\n"
" You can track your issues from this menu and the action we\n"
" will take.\n"
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Klikkaa luodaksesi palautteen.\n"
" </p><p>\n"
" Voit seurata palautteitasi ja niiden\n"
" etenemistä tästä valikosta.\n"
" </p>\n"
" "
#. module: portal_project_issue
#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
msgid "Issues"
msgstr "Ilmoitukset"

149
addons/product_expiry/i18n/am.po Normal file
View File

@ -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 <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
"Language-Team: Amharic <am@li.org>\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 "እቃውን የማሳወቅያ ግዜ"

5
addons/project/project_data.xml
View File

@ -78,6 +78,7 @@
<field name="name">Task Created</field>
<field name="res_model">project.task</field>
<field name="default" eval="False"/>
<field name="hidden" eval="True"/>
<field name="description">Task created</field>
</record>
<record id="mt_task_assigned" model="mail.message.subtype">
@ -101,6 +102,7 @@
<!-- Project-related subtypes for messaging / Chatter -->
<record id="mt_project_task_new" model="mail.message.subtype">
<field name="name">Task Created</field>
<field name="sequence">10</field>
<field name="res_model">project.project</field>
<field name="default" eval="False"/>
<field name="parent_id" eval="ref('mt_task_new')"/>
@ -108,6 +110,7 @@
</record>
<record id="mt_project_task_assigned" model="mail.message.subtype">
<field name="name">Task Assigned</field>
<field name="sequence">11</field>
<field name="res_model">project.project</field>
<field name="default" eval="False"/>
<field name="parent_id" eval="ref('mt_task_assigned')"/>
@ -115,12 +118,14 @@
</record>
<record id="mt_project_task_blocked" model="mail.message.subtype">
<field name="name">Task Blocked</field>
<field name="sequence">12</field>
<field name="res_model">project.project</field>
<field name="parent_id" eval="ref('mt_task_blocked')"/>
<field name="relation_field">project_id</field>
</record>
<record id="mt_project_task_stage" model="mail.message.subtype">
<field name="name">Task Stage Changed</field>
<field name="sequence">13</field>
<field name="res_model">project.project</field>
<field name="parent_id" eval="ref('mt_task_stage')"/>
<field name="relation_field">project_id</field>

5
addons/project_issue/project_issue_data.xml
View File

@ -33,6 +33,7 @@ Access all issues from the top Project menu, and access the issues of a specific
<field name="name">Issue Created</field>
<field name="res_model">project.issue</field>
<field name="default" eval="False"/>
<field name="hidden" eval="True"/>
<field name="description">Issue created</field>
</record>
<record id="mt_issue_assigned" model="mail.message.subtype">
@ -56,6 +57,7 @@ Access all issues from the top Project menu, and access the issues of a specific
<!-- Project-related subtypes for messaging / Chatter -->
<record id="mt_project_issue_new" model="mail.message.subtype">
<field name="name">Issue Created</field>
<field name="sequence">20</field>
<field name="res_model">project.project</field>
<field name="default" eval="False"/>
<field name="parent_id" eval="ref('mt_issue_new')"/>
@ -63,6 +65,7 @@ Access all issues from the top Project menu, and access the issues of a specific
</record>
<record id="mt_project_issue_assigned" model="mail.message.subtype">
<field name="name">Issue Assigned</field>
<field name="sequence">21</field>
<field name="res_model">project.project</field>
<field name="default" eval="False"/>
<field name="parent_id" eval="ref('mt_issue_assigned')"/>
@ -70,12 +73,14 @@ Access all issues from the top Project menu, and access the issues of a specific
</record>
<record id="mt_project_issue_blocked" model="mail.message.subtype">
<field name="name">Issue Blocked</field>
<field name="sequence">22</field>
<field name="res_model">project.project</field>
<field name="parent_id" eval="ref('mt_issue_blocked')"/>
<field name="relation_field">project_id</field>
</record>
<record id="mt_project_issue_stage" model="mail.message.subtype">
<field name="name">Issue Stage Changed</field>
<field name="sequence">23</field>
<field name="res_model">project.project</field>
<field name="description">Stage changed</field>
<field name="parent_id" eval="ref('mt_issue_stage')"/>

2
addons/sale_crm/sale_crm_data.xml
View File

@ -5,12 +5,14 @@
<!-- Salesteam-related subtypes for messaging / Chatter -->
<record id="mt_salesteam_order_sent" model="mail.message.subtype">
<field name="name">Quotation Send</field>
<field name="sequence">20</field>
<field name="res_model">crm.case.section</field>
<field name="parent_id" eval="ref('sale.mt_order_sent')"/>
<field name="relation_field">section_id</field>
</record>
<record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
<field name="name">Sales Order Confirmed</field>
<field name="sequence">21</field>
<field name="res_model">crm.case.section</field>
<field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
<field name="relation_field">section_id</field>

8
addons/website/views/snippets.xml
View File

@ -688,22 +688,22 @@
<div class="col-md-3 text-center">
<span class="fa fa-suitcase fa-5x"></span>
<h3 class="mt8 mb0">First Feature</h3>
<p class="text-muted">Tell what's the value for the customer for this feature.</p>
<div class="text-muted">Tell what's the value for the customer for this feature.</div>
</div>
<div class="col-md-3 text-center">
<span class="fa fa-lock fa-5x"></span>
<h3 class="mt8 mb0">Second Feature</h3>
<p class="text-muted">Write what the customer would like to know, not what you want to show.</p>
<div class="text-muted">Write what the customer would like to know, not what you want to show.</div>
</div>
<div class="col-md-3 text-center">
<span class="fa fa-heart fa-5x"></span>
<h3 class="mt8 mb0">Third Feature</h3>
<p class="text-muted">A small explanation of this great feature, in clear words.</p>
<div class="text-muted">A small explanation of this great feature, in clear words.</div>
</div>
<div class="col-md-3 text-center">
<span class="fa fa-credit-card fa-5x"></span>
<h3 class="mt8 mb0">Fourth Feature</h3>
<p class="text-muted">A small explanation of this great feature on two lines.</p>
<div class="text-muted">A small explanation of this great feature on two lines.</div>
</div>
</div>
</div>

2
addons/website/views/website_templates.xml
View File

@ -250,7 +250,7 @@
</div>
</div>
</xpath>
<xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
<xpath expr='//script[@src="/web/static/lib/bootstrap/js/bootstrap.js"]' position="before">
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
<link rel='stylesheet' href='/website/static/src/css/editor.css'/>
<link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>