-
+
@
Organized by
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index b353b5b0e3a..a6c27495e1c 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 07:58+0000\n"
-"Last-Translator: Walter Cheuk \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 10:20+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:02+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: event
#: view:event.event:0
@@ -24,55 +24,55 @@ msgstr "發票資訊"
#. module: event
#: view:partner.event.registration:0
msgid "Event Details"
-msgstr "活動詳情"
+msgstr "事件細節"
#. module: event
#: field:event.event,main_speaker_id:0
msgid "Main Speaker"
-msgstr "主講者"
+msgstr "主要關注者"
#. module: event
#: view:event.event:0
#: view:event.registration:0
#: view:report.event.registration:0
msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
#. module: event
#: field:event.event,register_min:0
msgid "Minimum Registrations"
-msgstr "最小登記數"
+msgstr "最少的登記記錄"
#. module: event
#: model:ir.model,name:event.model_event_confirm_registration
msgid "Confirmation for Event Registration"
-msgstr "活動登記確認"
+msgstr "確認事件的登記記錄"
#. module: event
#: field:event.registration.badge,title:0
msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
#. module: event
#: field:event.event,mail_registr:0
msgid "Registration Email"
-msgstr "登記電郵"
+msgstr "登記記錄的郵件"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_confirm_registration
msgid "Make Invoices"
-msgstr "開立發票"
+msgstr "生成發票"
#. module: event
#: view:event.event:0
#: view:event.registration:0
msgid "Registration Date"
-msgstr "登記日期"
+msgstr "登錄日期"
#. module: event
#: view:partner.event.registration:0
msgid "_Close"
-msgstr "結束(_C)"
+msgstr "結束"
#. module: event
#: model:event.event,name:event.event_0
@@ -82,17 +82,17 @@ msgstr "Bon Jovi 演唱會"
#. module: event
#: view:report.event.registration:0
msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "僅已開發票的報名者"
#. module: event
#: selection:report.event.registration,month:0
msgid "March"
-msgstr "三月"
+msgstr "3月"
#. module: event
#: field:event.event,mail_confirm:0
msgid "Confirmation Email"
-msgstr "確認電郵"
+msgstr "確認電子郵件"
#. module: event
#: field:event.registration,nb_register:0
@@ -103,7 +103,7 @@ msgstr "數量"
#: code:addons/event/wizard/event_make_invoice.py:63
#, python-format
msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "登記記錄沒有給任何業務夥伴開發票"
#. module: event
#: field:event.event,company_id:0
@@ -121,7 +121,7 @@ msgstr "發票日期"
#. module: event
#: help:event.event,pricelist_id:0
msgid "Pricelist version for current event."
-msgstr "當前活動價目表版本"
+msgstr "當前事件的價目表版本"
#. module: event
#: code:addons/event/wizard/partner_event_registration.py:88
@@ -131,17 +131,17 @@ msgstr "當前活動價目表版本"
#: view:partner.event.registration:0
#, python-format
msgid "Event Registration"
-msgstr "活動登記"
+msgstr "事件登錄"
#. module: event
#: field:event.event,parent_id:0
msgid "Parent Event"
-msgstr "上級活動"
+msgstr "上級事件"
#. module: event
#: model:ir.actions.act_window,name:event.action_make_invoices
msgid "Make Invoice"
-msgstr "開立發票"
+msgstr "生成發票"
#. module: event
#: field:event.registration,price_subtotal:0
@@ -151,27 +151,27 @@ msgstr "小計"
#. module: event
#: view:report.event.registration:0
msgid "Event on Registration"
-msgstr "正登記活動"
+msgstr "登錄的事件"
#. module: event
#: help:event.event,reply_to:0
msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "所有系統的電子郵件在「回覆」填入這郵件地址。"
#. module: event
#: view:event.registration:0
msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "新增內部備註"
#. module: event
#: view:event.event:0
msgid "Confirmed events"
-msgstr ""
+msgstr "已確認的活動"
#. module: event
#: view:report.event.registration:0
msgid "Event Beginning Date"
-msgstr ""
+msgstr "活動開始日期"
#. module: event
#: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,17 +179,17 @@ msgstr ""
#: model:ir.ui.menu,name:event.menu_report_event_registration
#: view:report.event.registration:0
msgid "Events Analysis"
-msgstr "活動分析"
+msgstr "事件分析"
#. module: event
#: field:event.registration,message_ids:0
msgid "Messages"
-msgstr "郵件"
+msgstr "訊息"
#. module: event
#: model:ir.model,name:event.model_event_registration_badge
msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
#. module: event
#: field:event.event,mail_auto_confirm:0
@@ -206,25 +206,25 @@ msgstr "歌劇門票"
#: view:event.event:0
#, python-format
msgid "Confirm Event"
-msgstr "確認活動"
+msgstr "確認事件"
#. module: event
#: selection:event.event,state:0
#: selection:event.registration,state:0
#: selection:report.event.registration,state:0
msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
#. module: event
#: field:event.event,reply_to:0
msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆:"
#. module: event
#: model:ir.actions.act_window,name:event.open_board_associations_manager
#: model:ir.ui.menu,name:event.menu_board_associations_manager
msgid "Event Dashboard"
-msgstr "活動儀錶板"
+msgstr "事件控制台"
#. module: event
#: model:event.event,name:event.event_1
@@ -234,40 +234,40 @@ msgstr "威爾第歌劇"
#. module: event
#: selection:report.event.registration,month:0
msgid "July"
-msgstr "七月"
+msgstr "7月"
#. module: event
#: help:event.event,register_prospect:0
msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "意向報名者合計"
#. module: event
#: help:event.event,mail_auto_confirm:0
msgid ""
"Check this box if you want to use automatic confirmation emailing or "
"reminder."
-msgstr ""
+msgstr "如果你想用自動確認郵件或提醒請勾選這裡。"
#. module: event
#: field:event.registration,ref:0
msgid "Reference"
-msgstr "參照"
+msgstr "關聯"
#. module: event
#: help:event.event,date_end:0
#: help:partner.event.registration,end_date:0
msgid "Closing Date of Event"
-msgstr "活動結束日期"
+msgstr "事件的結束日期"
#. module: event
#: view:event.registration:0
msgid "Emails"
-msgstr "電郵"
+msgstr "電子郵件"
#. module: event
#: view:event.registration:0
msgid "Extra Info"
-msgstr "額外資訊"
+msgstr "附加資訊"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:83
@@ -279,17 +279,17 @@ msgstr "客戶發票"
#: selection:event.event,state:0
#: selection:report.event.registration,state:0
msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
#. module: event
#: field:event.type,name:0
msgid "Event type"
-msgstr "活動類型"
+msgstr "事件類型"
#. module: event
#: model:ir.model,name:event.model_event_type
msgid " Event Type "
-msgstr " 活動類型 "
+msgstr " 事件類型 "
#. module: event
#: view:event.event:0
@@ -301,13 +301,13 @@ msgstr " 活動類型 "
#: field:report.event.registration,event_id:0
#: view:res.partner:0
msgid "Event"
-msgstr "活動"
+msgstr "事件"
#. module: event
#: view:event.registration:0
#: field:event.registration,badge_ids:0
msgid "Badges"
-msgstr "襟章"
+msgstr "標記"
#. module: event
#: view:event.event:0
@@ -316,38 +316,38 @@ msgstr "襟章"
#: selection:event.registration,state:0
#: selection:report.event.registration,state:0
msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
#. module: event
#: view:event.confirm.registration:0
msgid "Registration Confirmation"
-msgstr "登記確認"
+msgstr "確認登記記錄"
#. module: event
#: view:event.event:0
msgid "Events in New state"
-msgstr ""
+msgstr "在新建狀態的活動"
#. module: event
#: view:report.event.registration:0
msgid "Confirm"
-msgstr ""
+msgstr "確認"
#. module: event
#: view:event.event:0
#: field:event.event,speaker_ids:0
msgid "Other Speakers"
-msgstr "其他講者"
+msgstr "其他關注者"
#. module: event
#: model:ir.model,name:event.model_event_make_invoice
msgid "Event Make Invoice"
-msgstr "活動開立發票"
+msgstr "事件建立發票"
#. module: event
#: help:event.registration,nb_register:0
msgid "Number of Registrations or Tickets"
-msgstr "登記或門票數量"
+msgstr "登錄編號或票"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:50
@@ -361,30 +361,30 @@ msgstr "警告!"
#. module: event
#: view:event.registration:0
msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新電子郵件"
#. module: event
#: help:event.event,register_min:0
msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "提供最小的報名人數"
#. module: event
#: view:event.event:0
msgid "Location"
-msgstr "地點"
+msgstr "位置"
#. module: event
#: view:event.event:0
#: view:event.registration:0
#: view:report.event.registration:0
msgid "New"
-msgstr ""
+msgstr "新建"
#. module: event
#: field:event.event,register_current:0
#: view:report.event.registration:0
msgid "Confirmed Registrations"
-msgstr "已確認登記"
+msgstr "確認登記記錄"
#. module: event
#: field:event.event,mail_auto_registr:0
@@ -400,7 +400,7 @@ msgstr "類型"
#. module: event
#: field:event.registration,email_from:0
msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
#. module: event
#: help:event.event,mail_confirm:0
@@ -408,17 +408,17 @@ msgid ""
"This email will be sent when the event gets confirmed or when someone "
"subscribes to a confirmed event. This is also the email sent to remind "
"someone about the event."
-msgstr ""
+msgstr "這封郵件會在活動已確認或有人註冊了已確認的郵件時發送。此郵件也會發送關於本活動的提醒。"
#. module: event
#: field:event.registration,tobe_invoiced:0
msgid "To be Invoiced"
-msgstr ""
+msgstr "待開票"
#. module: event
#: view:event.event:0
msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
#. module: event
#: code:addons/event/event.py:398
@@ -430,55 +430,55 @@ msgstr "錯誤!"
#: field:event.event,name:0
#: field:event.registration,name:0
msgid "Summary"
-msgstr "摘要"
+msgstr "概要"
#. module: event
#: field:event.registration,create_date:0
msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
#. module: event
#: view:event.event:0
#: view:event.registration:0
#: view:res.partner:0
msgid "Cancel Registration"
-msgstr "取消登記"
+msgstr "取消登記記錄"
#. module: event
#: code:addons/event/event.py:399
#, python-format
msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要開票的登記記錄裡的業務夥伴沒地址"
#. module: event
#: view:report.event.registration:0
msgid "Events created in last month"
-msgstr ""
+msgstr "上個月新建的活動"
#. module: event
#: view:report.event.registration:0
msgid "Events created in current year"
-msgstr ""
+msgstr "本年新建的活動"
#. module: event
#: help:event.event,type:0
msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "活動類型,如座談會、展覽、會議、培訓"
+msgstr "事件類型如:研討會,展覽,會議,培訓。"
#. module: event
#: view:event.registration:0
msgid "Confirmed registrations"
-msgstr ""
+msgstr "確認報名者"
#. module: event
#: view:event.event:0
msgid "Event Organization"
-msgstr "活動組織"
+msgstr "事件結構"
#. module: event
#: view:event.registration:0
msgid "History Information"
-msgstr "歷史資訊"
+msgstr "日誌資訊"
#. module: event
#: view:event.registration:0
@@ -489,18 +489,18 @@ msgstr "日期"
#: view:event.confirm:0
#: view:event.confirm.registration:0
msgid "Confirm Anyway"
-msgstr "無論如何確認"
+msgstr "總是確認"
#. module: event
#: code:addons/event/wizard/event_confirm_registration.py:54
#, python-format
msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "警告:這事件 '%s'已達到最高極限 (%s)。"
#. module: event
#: view:report.event.registration:0
msgid " Month-1 "
-msgstr ""
+msgstr " 上月 "
#. module: event
#: view:event.event:0
@@ -508,17 +508,17 @@ msgstr ""
#: field:event.registration.badge,registration_id:0
#: model:ir.actions.act_window,name:event.act_event_list_register_event
msgid "Registration"
-msgstr "登記"
+msgstr "登記記錄"
#. module: event
#: field:report.event.registration,nbevent:0
msgid "Number Of Events"
-msgstr "活動數目"
+msgstr "事件數"
#. module: event
#: help:event.event,main_speaker_id:0
msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "要在這次活動上發言的演講者"
#. module: event
#: help:event.event,state:0
@@ -527,17 +527,18 @@ msgid ""
"particular dates the state is set to 'Confirmed'. If the event is over, the "
"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
msgstr ""
+"如果事件剛建立狀態是「草稿」。如果事件在具體的日期已確認狀態是「已確認」。如果事件結束狀態設為「完成」。如果事件已經取消狀態是「已取消」。"
#. module: event
#: view:event.event:0
msgid "Cancel Event"
-msgstr "取消活動"
+msgstr "取消事件"
#. module: event
#: view:event.event:0
#: view:event.registration:0
msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯繫方式"
#. module: event
#: view:event.event:0
@@ -545,45 +546,45 @@ msgstr "聯絡人"
#: field:event.registration,partner_id:0
#: model:ir.model,name:event.model_res_partner
msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
#. module: event
#: view:board.board:0
#: model:ir.actions.act_window,name:event.act_event_reg
#: view:report.event.registration:0
msgid "Events Filling Status"
-msgstr ""
+msgstr "事件填充狀態"
#. module: event
#: field:event.make.invoice,grouped:0
msgid "Group the invoices"
-msgstr "發票分類"
+msgstr "發票組"
#. module: event
#: view:event.event:0
msgid "Mailing"
-msgstr ""
+msgstr "郵遞"
#. module: event
#: view:report.event.registration:0
msgid "Events States"
-msgstr ""
+msgstr "活動狀態"
#. module: event
#: view:board.board:0
#: field:event.event,register_prospect:0
msgid "Unconfirmed Registrations"
-msgstr "未確認登記"
+msgstr "不確認登記記錄"
#. module: event
#: field:event.registration,partner_invoice_id:0
msgid "Partner Invoiced"
-msgstr ""
+msgstr "已開票業務夥伴"
#. module: event
#: help:event.event,register_max:0
msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "提供本次報名的最大人數"
#. module: event
#: field:event.registration,log_ids:0
@@ -598,17 +599,17 @@ msgstr "日誌"
#: view:report.event.registration:0
#: field:report.event.registration,state:0
msgid "State"
-msgstr ""
+msgstr "狀態"
#. module: event
#: selection:report.event.registration,month:0
msgid "September"
-msgstr "九月"
+msgstr "9月"
#. module: event
#: selection:report.event.registration,month:0
msgid "December"
-msgstr "十二月"
+msgstr "12月"
#. module: event
#: field:event.registration,event_product:0
@@ -618,28 +619,28 @@ msgstr "發票名稱"
#. module: event
#: field:report.event.registration,draft_state:0
msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # 沒草稿狀態的登記記錄"
#. module: event
#: view:report.event.registration:0
#: field:report.event.registration,month:0
msgid "Month"
-msgstr "月"
+msgstr "月份"
#. module: event
#: view:event.event:0
msgid "Event Done"
-msgstr "活動完結"
+msgstr "事件完成"
#. module: event
#: view:event.registration:0
msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "未確認狀態的報名者"
#. module: event
#: help:event.event,register_current:0
msgid "Total of Open and Done Registrations"
-msgstr "開放及完成登記總數"
+msgstr "開啟和完成的登記記錄共有"
#. module: event
#: field:event.confirm.registration,msg:0
@@ -649,35 +650,35 @@ msgstr "訊息"
#. module: event
#: constraint:event.event:0
msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤!你不能建立互相調用的事件。"
#. module: event
#: field:event.registration,ref2:0
msgid "Reference 2"
-msgstr "參照 2"
+msgstr "關聯2"
#. module: event
#: code:addons/event/event.py:361
#: view:report.event.registration:0
#, python-format
msgid "Invoiced"
-msgstr "已開發票"
+msgstr "已開票"
#. module: event
#: view:event.event:0
#: view:report.event.registration:0
msgid "My Events"
-msgstr "我的活動"
+msgstr "我的事件"
#. module: event
#: view:event.event:0
msgid "Speakers"
-msgstr "講者"
+msgstr "關注者"
#. module: event
#: view:event.make.invoice:0
msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
#. module: event
#: help:event.registration,email_cc:0
@@ -685,12 +686,12 @@ msgid ""
"These email addresses will be added to the CC field of all inbound and "
"outbound emails for this record before being sent. Separate multiple email "
"addresses with a comma"
-msgstr ""
+msgstr "這些郵箱地址將添加到所有接收的發送郵件的副本欄位,用逗號分隔多個郵件地址。"
#. module: event
#: view:event.make.invoice:0
msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成發票嗎 ?"
#. module: event
#: view:event.event:0
@@ -700,12 +701,12 @@ msgstr "開始日期"
#. module: event
#: field:event.registration,date_closed:0
msgid "Closed"
-msgstr "結束"
+msgstr "已結束"
#. module: event
#: view:report.event.registration:0
msgid "Events which are in New state"
-msgstr ""
+msgstr "新建狀態的活動"
#. module: event
#: view:event.event:0
@@ -714,28 +715,28 @@ msgstr ""
#: model:ir.ui.menu,name:event.menu_event_event_assiciation
#: view:res.partner:0
msgid "Events"
-msgstr "活動"
+msgstr "事件"
#. module: event
#: field:partner.event.registration,nb_register:0
msgid "Number of Registration"
-msgstr "登記數量"
+msgstr "登記記錄數"
#. module: event
#: field:event.event,child_ids:0
msgid "Child Events"
-msgstr "子活動"
+msgstr "子事件"
#. module: event
#: selection:report.event.registration,month:0
msgid "August"
-msgstr "八月"
+msgstr "8月"
#. module: event
#: field:res.partner,event_ids:0
#: field:res.partner,event_registration_ids:0
msgid "unknown"
-msgstr "不詳"
+msgstr "未知的"
#. module: event
#: help:event.event,product_id:0
@@ -743,39 +744,39 @@ msgid ""
"The invoices of this event registration will be created with this Product. "
"Thus it allows you to set the default label and the accounting info you want "
"by default on these invoices."
-msgstr ""
+msgstr "將建立這事件登記記錄的產品發票。因此對這些預設發票它允許你設置預設的標籤和會計資訊。"
#. module: event
#: selection:report.event.registration,month:0
msgid "June"
-msgstr "六月"
+msgstr "6月"
#. module: event
#: model:product.template,name:event.event_product_0_product_template
msgid "Ticket for Concert"
-msgstr ""
+msgstr "合作的門票"
#. module: event
#: field:event.registration,write_date:0
msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
#. module: event
#: view:event.registration:0
msgid "My Registrations"
-msgstr "我的登記"
+msgstr "我的登記記錄"
#. module: event
#: view:event.confirm:0
msgid ""
"Warning: This Event has not reached its Minimum Registration Limit. Are you "
"sure you want to confirm it?"
-msgstr "警告:本活動未達最少登記限制。是否確認?"
+msgstr "警告:這事件沒有達到最低登記記錄的規定,你肯定要確認它?"
#. module: event
#: field:event.registration,active:0
msgid "Active"
-msgstr ""
+msgstr "生效"
#. module: event
#: field:event.registration,date:0
@@ -785,12 +786,12 @@ msgstr "開始日期"
#. module: event
#: selection:report.event.registration,month:0
msgid "November"
-msgstr "十一月"
+msgstr "11月"
#. module: event
#: view:report.event.registration:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
#. module: event
#: field:partner.event.registration,start_date:0
@@ -800,7 +801,7 @@ msgstr "開始日期"
#. module: event
#: selection:report.event.registration,month:0
msgid "October"
-msgstr "十月"
+msgstr "10月"
#. module: event
#: field:event.event,language:0
@@ -811,22 +812,22 @@ msgstr "語言"
#: view:event.registration:0
#: field:event.registration,email_cc:0
msgid "CC"
-msgstr "副本(CC)"
+msgstr "抄送"
#. module: event
#: selection:report.event.registration,month:0
msgid "January"
-msgstr "一月"
+msgstr "1月"
#. module: event
#: help:event.registration,email_from:0
msgid "These people will receive email."
-msgstr "此等人士會收到電郵"
+msgstr "這些人將收到電子郵件。"
#. module: event
#: view:event.event:0
msgid "Set To Draft"
-msgstr "設為草案"
+msgstr "設為草稿"
#. module: event
#: code:addons/event/event.py:499
@@ -835,7 +836,7 @@ msgstr "設為草案"
#: view:res.partner:0
#, python-format
msgid "Confirm Registration"
-msgstr "確認登記"
+msgstr "確認登記記錄"
#. module: event
#: view:event.event:0
@@ -847,39 +848,39 @@ msgstr "日期"
#. module: event
#: view:event.event:0
msgid "Registration Email Body"
-msgstr "登記電郵內容"
+msgstr "登記記錄的郵件內容"
#. module: event
#: view:event.event:0
msgid "Confirmation Email Body"
-msgstr "確認電郵內容"
+msgstr "確認郵件內容"
#. module: event
#: view:report.event.registration:0
msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "在已確認或已完成狀態的報名者"
#. module: event
#: view:event.registration:0
#: view:res.partner:0
msgid "History"
-msgstr "歷史"
+msgstr "日誌"
#. module: event
#: field:event.event,address_id:0
msgid "Location Address"
-msgstr "地點位址"
+msgstr "地址"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_type
#: model:ir.ui.menu,name:event.menu_event_type
msgid "Types of Events"
-msgstr "活動類型"
+msgstr "事件類型"
#. module: event
#: field:event.registration,contact_id:0
msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯繫方式"
#. module: event
#: field:event.event,pricelist_id:0
@@ -890,12 +891,12 @@ msgstr "價目表"
#: code:addons/event/wizard/event_make_invoice.py:59
#, python-format
msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "事件沒關聯任何定義的產品"
#. module: event
#: view:event.event:0
msgid "Auto Confirmation Email"
-msgstr "自動確認電郵"
+msgstr "自動確認郵件"
#. module: event
#: view:event.registration:0
@@ -905,7 +906,7 @@ msgstr "雜項"
#. module: event
#: constraint:event.event:0
msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "錯誤!結束日期不能早於開始日期"
+msgstr "錯誤!結束日期不能在開始日期前。"
#. module: event
#: code:addons/event/event.py:446
@@ -932,7 +933,7 @@ msgstr "發票"
#: view:report.event.registration:0
#: field:report.event.registration,year:0
msgid "Year"
-msgstr "年份"
+msgstr "年"
#. module: event
#: code:addons/event/event.py:465
@@ -945,30 +946,30 @@ msgstr "取消"
#: view:event.confirm.registration:0
#: view:event.make.invoice:0
msgid "Close"
-msgstr "關閉"
+msgstr "結束"
#. module: event
#: view:event.event:0
msgid "Event by Registration"
-msgstr "各登記活動"
+msgstr "事件登記記錄"
#. module: event
#: code:addons/event/event.py:436
#, python-format
msgid "Open"
-msgstr "開放"
+msgstr "開啟"
#. module: event
#: field:event.event,user_id:0
msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "責任用戶"
#. module: event
#: code:addons/event/event.py:561
#: code:addons/event/event.py:568
#, python-format
msgid "Auto Confirmation: [%s] %s"
-msgstr "自動確認:[%s] %s"
+msgstr "自動確認: [%s] %s"
#. module: event
#: view:event.event:0
@@ -977,14 +978,14 @@ msgstr "自動確認:[%s] %s"
#: view:report.event.registration:0
#: field:report.event.registration,user_id:0
msgid "Responsible"
-msgstr "負責"
+msgstr "負責人"
#. module: event
#: field:event.event,unit_price:0
#: view:event.registration:0
#: field:partner.event.registration,unit_price:0
msgid "Registration Cost"
-msgstr "登記成本"
+msgstr "登記記錄的成本"
#. module: event
#: field:event.registration,unit_price:0
@@ -996,7 +997,7 @@ msgstr "單價"
#: field:report.event.registration,speaker_id:0
#: field:res.partner,speaker:0
msgid "Speaker"
-msgstr "講者"
+msgstr "關注者"
#. module: event
#: model:event.event,name:event.event_2
@@ -1011,13 +1012,13 @@ msgstr "回覆"
#. module: event
#: view:report.event.registration:0
msgid "Events created in current month"
-msgstr ""
+msgstr "本月新建的活動"
#. module: event
#: help:event.event,mail_auto_registr:0
msgid ""
"Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "如果你要自動發郵件給新的報名者請勾選此項。"
#. module: event
#: field:event.event,date_end:0
@@ -1038,12 +1039,12 @@ msgstr "產品"
#: view:event.registration:0
#: field:event.registration,description:0
msgid "Description"
-msgstr "說明"
+msgstr "描述"
#. module: event
#: field:report.event.registration,confirm_state:0
msgid " # No of Confirmed Registrations"
-msgstr " # 已確認登記數"
+msgstr " # 沒確認登記記錄"
#. module: event
#: model:ir.actions.act_window,name:event.act_register_event_partner
@@ -1053,17 +1054,17 @@ msgstr "訂閱"
#. module: event
#: selection:report.event.registration,month:0
msgid "May"
-msgstr "五月"
+msgstr "5月"
#. module: event
#: view:res.partner:0
msgid "Events Registration"
-msgstr "活動登記"
+msgstr "事件登記記錄"
#. module: event
#: help:event.event,mail_registr:0
msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "當有人讚同這事件時將發送這郵件"
#. module: event
#: model:product.template,name:event.event_product_2_product_template
@@ -1073,34 +1074,34 @@ msgstr "會議門票"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_type_association
msgid "Events Type"
-msgstr ""
+msgstr "活動類型"
#. module: event
#: field:event.registration.badge,address_id:0
msgid "Address"
-msgstr "地址"
+msgstr "地址:"
#. module: event
#: view:board.board:0
#: model:ir.actions.act_window,name:event.act_event_view
msgid "Next Events"
-msgstr "下個活動"
+msgstr "下一個事件"
#. module: event
#: view:partner.event.registration:0
msgid "_Subcribe"
-msgstr "訂閱(_S)"
+msgstr "訂閱"
#. module: event
#: model:ir.model,name:event.model_partner_event_registration
msgid " event Registration "
-msgstr " 活動登記 "
+msgstr " 事件登記記錄 "
#. module: event
#: help:event.event,date_begin:0
#: help:partner.event.registration,start_date:0
msgid "Beginning Date of Event"
-msgstr "活動開始日"
+msgstr "事件開始日期"
#. module: event
#: selection:event.registration,state:0
@@ -1111,22 +1112,22 @@ msgstr "未確認"
#: code:addons/event/event.py:565
#, python-format
msgid "Auto Registration: [%s] %s"
-msgstr "自動登記:[%s] %s"
+msgstr "自動登記記錄: [%s] %s"
#. module: event
#: field:event.registration,date_deadline:0
msgid "End Date"
-msgstr "結束日"
+msgstr "結束日期"
#. module: event
#: selection:report.event.registration,month:0
msgid "February"
-msgstr "二月"
+msgstr "2月"
#. module: event
#: view:board.board:0
msgid "Association Dashboard"
-msgstr ""
+msgstr "商會控制台"
#. module: event
#: view:event.event:0
@@ -1140,18 +1141,18 @@ msgstr "名稱"
#: view:report.event.registration:0
#: field:report.event.registration,section_id:0
msgid "Sale Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
#. module: event
#: field:event.event,country_id:0
msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:55
#, python-format
msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "登記記錄設置為不能開發票"
#. module: event
#: code:addons/event/event.py:527
@@ -1160,24 +1161,24 @@ msgstr ""
#: view:res.partner:0
#, python-format
msgid "Close Registration"
-msgstr "結束登記"
+msgstr "結束登記記錄"
#. module: event
#: selection:report.event.registration,month:0
msgid "April"
-msgstr "四月"
+msgstr "4月"
#. module: event
#: help:event.event,unit_price:0
msgid ""
"This will be the default price used as registration cost when invoicing this "
"event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "這裡是開發票是預設的報名價格,注意你可以對每個報名者用不同的價格。"
#. module: event
#: view:report.event.registration:0
msgid "Events which are in confirm state"
-msgstr ""
+msgstr "已確認狀態的活動"
#. module: event
#: view:event.event:0
@@ -1185,7 +1186,7 @@ msgstr ""
#: view:report.event.registration:0
#: field:report.event.registration,type:0
msgid "Event Type"
-msgstr "活動類型"
+msgstr "事件類型"
#. module: event
#: view:event.event:0
@@ -1194,51 +1195,51 @@ msgstr "活動類型"
#: model:ir.ui.menu,name:event.menu_action_registration
#: model:ir.ui.menu,name:event.menu_action_registration_association
msgid "Registrations"
-msgstr "登記"
+msgstr "登記記錄"
#. module: event
#: field:event.registration,id:0
msgid "ID"
-msgstr ""
+msgstr "標識"
#. module: event
#: field:event.event,register_max:0
#: field:report.event.registration,register_max:0
msgid "Maximum Registrations"
-msgstr "最大登記數"
+msgstr "最多的登記記錄"
#. module: event
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤,您不能建立循環引用的會員用戶"
#. module: event
#: field:report.event.registration,date:0
msgid "Event Start Date"
-msgstr "活動開始日"
+msgstr "事件開始日期"
#. module: event
#: view:partner.event.registration:0
msgid "Event For Registration"
-msgstr "可登記活動"
+msgstr "登記記錄引起的事件"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:51
#, python-format
msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "如果登記記錄在 %s 狀態,不能開發票。"
#. module: event
#: view:event.confirm:0
#: model:ir.actions.act_window,name:event.action_event_confirm
#: model:ir.model,name:event.model_event_confirm
msgid "Event Confirmation"
-msgstr "活動確認"
+msgstr "事件確認"
#. module: event
#: view:event.event:0
msgid "Auto Registration Email"
-msgstr "自動登記電郵"
+msgstr "自動登記記錄郵件"
#. module: event
#: view:event.registration:0
@@ -1250,7 +1251,7 @@ msgstr "總計"
#. module: event
#: field:event.event,speaker_confirmed:0
msgid "Speaker Confirmed"
-msgstr "已確認講者"
+msgstr "關注者確認"
#. module: event
#: model:ir.actions.act_window,help:event.action_event_view
@@ -1259,7 +1260,7 @@ msgid ""
"should be synchronized with mobile devices or calendar applications through "
"caldav. Most of the users should work in the Calendar menu, and not in the "
"list of events."
-msgstr ""
+msgstr "事件是低層對象用於會議和其它文檔通過caldar同步移動設備或日程表應用程序。大多數用戶將使用日程表菜單而不是事件列表。"
#~ msgid "Provide Maximun Number of Registrations"
#~ msgstr "提供登記最大數"
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index bffc12fa553..764a9d8957f 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 03:32+0000\n"
+"Last-Translator: Bonnie Duan \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: 2012-08-28 06:27+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: event_project
#: model:ir.model,name:event_project.model_event_project
@@ -29,7 +29,7 @@ msgstr "結束日期"
#. module: event_project
#: view:event.project:0
msgid "Ok"
-msgstr ""
+msgstr "確認"
#. module: event_project
#: help:event.project,project_id:0
@@ -37,13 +37,13 @@ msgid ""
"This is Template Project. Project of event is a duplicate of this Template. "
"After click on 'Create Retro-planning', New Project will be duplicated from "
"this template project."
-msgstr ""
+msgstr "這是模板專案。專案的事件是重複的,這個模板。點擊打造追朔規劃“後,新專案將被複製此模板的專案。"
#. module: event_project
#: view:event.project:0
#: model:ir.actions.act_window,name:event_project.action_event_project
msgid "Retro-Planning"
-msgstr ""
+msgstr "追溯計畫"
#. module: event_project
#: constraint:event.event:0
@@ -63,23 +63,23 @@ msgstr "專案範本"
#. module: event_project
#: view:event.event:0
msgid "All tasks"
-msgstr ""
+msgstr "所有的工作任務"
#. module: event_project
#: view:event.event:0
#: model:ir.actions.act_window,name:event_project.act_event_task
msgid "Tasks"
-msgstr ""
+msgstr "任務"
#. module: event_project
#: constraint:event.event:0
msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤!您不能創建遞歸的事件"
#. module: event_project
#: field:event.event,task_ids:0
msgid "Project tasks"
-msgstr ""
+msgstr "專案任務"
#. module: event_project
#: view:event.project:0
@@ -94,7 +94,7 @@ msgstr "開始日期"
#. module: event_project
#: view:event.event:0
msgid "Create Retro-Planning"
-msgstr ""
+msgstr "創建追溯計畫"
#. module: event_project
#: model:ir.model,name:event_project.model_event_event
@@ -104,7 +104,7 @@ msgstr "活動"
#. module: event_project
#: view:event.event:0
msgid "Tasks Management"
-msgstr ""
+msgstr "任務管理"
#~ msgid ""
#~ "Organization and management of events.\n"
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..694f5736c72 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,7 +3,7 @@ var _t = instance.web._t;
instance.web.Sidebar = instance.web.Sidebar.extend({
on_attachments_loaded: function(attachments) {
- self = this
+ var self = this;
self._super(attachments);
// if attachment contains a google doc url do nothing
// else display a button to create a google doc
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0dcc675e665..99d7af027e9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -130,11 +130,11 @@
-
![]()
+
-
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 5840217d7ee..f687e91c3f0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -25,6 +25,7 @@ import datetime, time
from itertools import groupby
from operator import itemgetter
+import math
import netsvc
from osv import fields, osv
from tools.translate import _
@@ -112,7 +113,7 @@ class hr_holidays(osv.osv):
return result
_columns = {
- 'name': fields.char('Description', required=True, size=64),
+ 'name': fields.char('Description', size=64),
'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
\nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -123,8 +124,6 @@ class hr_holidays(osv.osv):
'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
- #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
- #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
@@ -134,8 +133,8 @@ class hr_holidays(osv.osv):
'parent_id': fields.many2one('hr.holidays', 'Parent'),
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
- 'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
- 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+ 'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+ 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
}
@@ -147,16 +146,11 @@ class hr_holidays(osv.osv):
'holiday_type': 'employee'
}
_sql_constraints = [
- ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category."),
+ ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."),
('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
]
- def create(self, cr, uid, vals, context=None):
- obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
- self.create_notificate(cr, uid, [obj_id], context=context)
- return obj_id
-
def _create_resource_leave(self, cr, uid, leaves, context=None):
'''This method will create entry in resource calendar leave object at the time of holidays validated '''
obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -201,8 +195,8 @@ class hr_holidays(osv.osv):
def unlink(self, cr, uid, ids, context=None):
for rec in self.browse(cr, uid, ids, context=context):
- if rec.state<>'draft':
- raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
+ if rec.state not in ['draft', 'cancel', 'confirm']:
+ raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
return super(hr_holidays, self).unlink(cr, uid, ids, context)
def onchange_date_from(self, cr, uid, ids, date_to, date_from):
@@ -210,7 +204,7 @@ class hr_holidays(osv.osv):
if date_to and date_from:
diff_day = self._get_number_of_days(date_from, date_to)
result['value'] = {
- 'number_of_days_temp': round(diff_day)+1
+ 'number_of_days_temp': round(math.floor(diff_day))+1
}
return result
result['value'] = {
@@ -244,29 +238,30 @@ class hr_holidays(osv.osv):
self.unlink(cr, uid, to_unlink, context=context)
return True
- def holidays_validate(self, cr, uid, ids, context=None):
+ def holidays_first_validate(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
- self.holidays_validate_notificate(cr, uid, ids, context=context)
+ self.holidays_first_validate_notificate(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
- def holidays_validate2(self, cr, uid, ids, context=None):
+ def holidays_validate(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
self.write(cr, uid, ids, {'state':'validate'})
data_holiday = self.browse(cr, uid, ids)
- holiday_ids = []
for record in data_holiday:
- if record.holiday_status_id.double_validation:
- holiday_ids.append(record.id)
+ if record.double_validation:
+ self.write(cr, uid, [record.id], {'manager_id2': manager})
+ else:
+ self.write(cr, uid, [record.id], {'manager_id': manager})
if record.holiday_type == 'employee' and record.type == 'remove':
meeting_obj = self.pool.get('crm.meeting')
meeting_vals = {
- 'name': record.name,
+ 'name': record.name or _('Leave Request'),
'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
'duration': record.number_of_days_temp * 8,
'description': record.notes,
@@ -301,25 +296,27 @@ class hr_holidays(osv.osv):
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
- if holiday_ids:
- self.holidays_valid2_notificate(cr, uid, holiday_ids, context=context)
- self.write(cr, uid, holiday_ids, {'manager_id2': manager})
+ self.holidays_validate_notificate(cr, uid, ids, context=context)
return True
def holidays_confirm(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
+ for record in self.browse(cr, uid, ids, context=context):
+ if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
+ self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
self.holidays_confirm_notificate(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'confirm'})
- def holidays_refuse(self, cr, uid, ids, approval, context=None):
+ def holidays_refuse(self, cr, uid, ids, context=None):
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
- if approval == 'first_approval':
- self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
- else:
- self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
- self.holidays_refuse_notificate(cr, uid, ids, approval, context=context)
+ for holiday in self.browse(cr, uid, ids, context=context):
+ if holiday.state == 'validate1':
+ self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id': manager})
+ else:
+ self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id2': manager})
+ self.holidays_refuse_notificate(cr, uid, ids, context=context)
self.holidays_cancel(cr, uid, ids, context=context)
return True
@@ -333,7 +330,7 @@ class hr_holidays(osv.osv):
# If a category that created several holidays, cancel all related
wf_service = netsvc.LocalService("workflow")
for request in record.linked_request_ids or []:
- wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
+ wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
self._remove_resource_leave(cr, uid, ids, context=context)
return True
@@ -355,7 +352,7 @@ class hr_holidays(osv.osv):
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
for obj in self.browse(cr, uid, ids, context=context):
- if obj.state == 'confirm' and obj.employee_id.parent_id:
+ if obj.state == 'confirm' and obj.holiday_type == 'employee' and obj.employee_id.parent_id:
result[obj.id] = [obj.employee_id.parent_id.user_id.id]
elif obj.state == 'validate1':
# get group_hr_manager: everyone will be warned of second validation
@@ -369,44 +366,38 @@ class hr_holidays(osv.osv):
def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
""" Add 'user_id' and 'manager' to the monitored fields """
res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
- # TODO: add manager
return res + ['user_id']
def create_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_append_note(cr, uid, ids, _('System notification'),
- _("The %s request has been created and is waiting confirmation.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been created and is waiting confirmation."), type='notification', context=context)
return True
def holidays_confirm_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been confirmed and is waiting for validation by the manager.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
+ _("The request has been submitted and is waiting for validation by the manager."), type='notification')
+ def holidays_first_validate_notificate(self, cr, uid, ids, context=None):
+ for obj in self.browse(cr, uid, ids, context=context):
+ self.message_append_note(cr, uid, [obj.id], _('System notification'),
+ _("The request has been approved. A second validation is necessary and is now pending."), type='notification', context=context)
+
def holidays_validate_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
- if obj.holiday_status_id.double_validation:
+ if obj.double_validation:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been approved. A second validation is necessary and is now pending.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been double validated. The validation process is now over."), type='notification', context=context)
else:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been approved. The validation process is now over.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been approved. The validation process is now over."), type='notification', context=context)
- def holidays_valid2_notificate(self, cr, uid, ids, context=None):
+
+ def holidays_refuse_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been double validated. The validation process is now over.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-
- def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
- for obj in self.browse(cr, uid, ids):
- self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been refused. The validation process is now over.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been refused. The validation process is now over."), type='notification', context=context)
hr_holidays()
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 6ad5a442a38..4c9d18683c7 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
Trip with Family
-
+
remove
@@ -52,13 +52,10 @@
-
-
-
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 711d07bbfe8..650445b2ade 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -84,56 +84,42 @@
-
+
Leave Request
hr.holidays
1