[MERGE]Merge with trunk
bzr revid: pza@tinyerp.com-20131101054805-1pp94mrwxd6ipwli
This commit is contained in:
Pooja Zankhariya (OpenERP)
@@ -93,7 +93,7 @@
|
||||
<notebook>
|
||||
<page string="Payment">
|
||||
<group col="4">
|
||||
<field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_residual','>',0)] "/>
|
||||
<field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0), ('account_id.reconcile', '=', True)] "/>
|
||||
<separator colspan="4" string="Transaction Information"/>
|
||||
<field name="date"/>
|
||||
<label for="amount_currency" groups="base.group_multi_currency"/>
|
||||
@@ -219,7 +219,7 @@
|
||||
<page string="Payment">
|
||||
<group col="4">
|
||||
<field name="order_id"/>
|
||||
<field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_residual','>',0)]"/>
|
||||
<field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0), ('account_id.reconcile', '=', True)]"/>
|
||||
<separator colspan="4" string="Transaction Information"/>
|
||||
<field name="date"/>
|
||||
<label for="amount_currency" groups="base.group_multi_currency"/>
|
||||
|
||||
@@ -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:05+0000\n"
|
||||
"PO-Revision-Date: 2012-11-29 11:10+0000\n"
|
||||
"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
|
||||
"PO-Revision-Date: 2013-10-30 10:49+0000\n"
|
||||
"Last-Translator: dengwei <250100785@qq.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: 2013-09-12 05:10+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
"X-Launchpad-Export-Date: 2013-10-31 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16820)\n"
|
||||
|
||||
#. module: event
|
||||
#: view:event.event:0
|
||||
@@ -572,6 +572,8 @@ msgid ""
|
||||
"status is set to 'Done'.If event is cancelled the status is set to "
|
||||
"'Cancelled'."
|
||||
msgstr ""
|
||||
"一个事件创建成功后，初始状态为草稿，如果某一天该事件被确认了，其状态会相应变为确认。如果该事件结束了，状态就会显示为已结束。当该事件被取消了，状态就显示为"
|
||||
"已取消。"
|
||||
|
||||
#. module: event
|
||||
#: model:ir.actions.act_window,help:event.action_event_view
|
||||
@@ -626,7 +628,7 @@ msgstr "如果你设定了邮件模板，每个参与者将收到邮件公告确
|
||||
#. module: event
|
||||
#: view:board.board:0
|
||||
msgid "Events Filling By Status"
|
||||
msgstr ""
|
||||
msgstr "按照状态过滤"
|
||||
|
||||
#. module: event
|
||||
#: selection:report.event.registration,event_state:0
|
||||
@@ -728,6 +730,13 @@ msgid ""
|
||||
" <p>Thank you for your participation!</p>\n"
|
||||
" <p>Best regards</p>"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"  : : : : : :<p>你好，${object.name},</p>\n"
|
||||
" : : : : : :<p>你注册的活动${object.event_id.name} "
|
||||
"已经被确认了，举办时间定在${object.event_id.date_begin} ~ ${object.event_id.date_end}之间.\n"
|
||||
" : : : : : :详细信息,请联系我们的活动组织部门.</p>\n"
|
||||
" : : : : : :<p>谢谢参与!</p>\n"
|
||||
" : : : : : :<p>此致敬礼</p>"
|
||||
|
||||
#. module: event
|
||||
#: field:event.event,message_is_follower:0
|
||||
@@ -796,7 +805,7 @@ msgstr "确认登记记录"
|
||||
msgid ""
|
||||
"You have already set a registration for this event as 'Attended'. Please "
|
||||
"reset it to draft if you want to cancel this event."
|
||||
msgstr ""
|
||||
msgstr "鉴于你已经注册该事件为“参加”。如果你想取消这次活动。请首先将其状态改为草稿。"
|
||||
|
||||
#. module: event
|
||||
#: view:res.partner:0
|
||||
@@ -829,7 +838,7 @@ msgstr "活动类型"
|
||||
msgid ""
|
||||
"This field contains the template of the mail that will be automatically sent "
|
||||
"each time a registration for this event is confirmed."
|
||||
msgstr ""
|
||||
msgstr "活动一旦被确认，这个字段包含的模板会自动发送的邮件。"
|
||||
|
||||
#. module: event
|
||||
#: view:event.event:0
|
||||
@@ -1022,7 +1031,7 @@ msgstr "4月"
|
||||
msgid ""
|
||||
"It will select this default confirmation event mail value when you choose "
|
||||
"this event"
|
||||
msgstr ""
|
||||
msgstr "当你选择了这个活动，它将选择这个默认确认事件邮件价值"
|
||||
|
||||
#. module: event
|
||||
#: view:report.event.registration:0
|
||||
@@ -1088,6 +1097,13 @@ msgid ""
|
||||
" <p>Thank you for your participation!</p>\n"
|
||||
" <p>Best regards</p>"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"  : : : : : :<p>你好，${object.name},</p>\n"
|
||||
" : : : : : :<p>你注册的活动${object.event_id.name} "
|
||||
"已经被正式记录了，一旦活动确认\n"
|
||||
"你将自动接收电子邮件提供您更多的实用信息(如进度、议程…)。\n"
|
||||
" : : : : : :<p>谢谢参与!</p>\n"
|
||||
" : : : : : :<p>此致敬礼</p>"
|
||||
|
||||
#. module: event
|
||||
#: help:event.event,reply_to:0
|
||||
@@ -1097,6 +1113,7 @@ msgid ""
|
||||
"registrations confirmation. You can also put the email address of your mail "
|
||||
"gateway if you use one."
|
||||
msgstr ""
|
||||
"在这里添写组织者的邮件地址,当活动或注册确认时，它会自动出现在在邮件的‘回复给’一栏里。如果你电子邮件地址使用的不是默认网关的话，则需要添写邮件网关。"
|
||||
|
||||
#. module: event
|
||||
#: view:event.event:0
|
||||
|
||||
@@ -14,7 +14,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-10-30 05:16+0000\n"
|
||||
"X-Launchpad-Export-Date: 2013-10-31 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16820)\n"
|
||||
|
||||
#. module: product_manufacturer
|
||||
|
||||
@@ -14,7 +14,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-10-30 05:16+0000\n"
|
||||
"X-Launchpad-Export-Date: 2013-10-31 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16820)\n"
|
||||
|
||||
#. module: product_visible_discount
|
||||
|
||||
Reference in New Issue
Block a user