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

[MERGE] latest trunk 

bzr revid: abo@openerp.com-20120706095207-6l2roojec1osazgi
This commit is contained in:
Antonin Bourguignon 2012-07-06 11:52:07 +02:00
parent 23aeb705be 84c6ee9a3b
commit e331988bf1
84 changed files with 851 additions and 2107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/account/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:18+0000\n" "PO-Revision-Date: 2012-07-06 02:41+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15461)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@ -4942,7 +4942,7 @@ msgstr "会計表"
#. module: account #. module: account
#: field:account.journal.column,name:0 #: field:account.journal.column,name:0
msgid "Column Name" msgid "Column Name"
msgstr "カラム名" msgstr "列名"
#. module: account #. module: account
#: view:account.general.journal:0 #: view:account.general.journal:0

2
addons/analytic_contract_expense_project/__openerp__.py
View File

@ -23,7 +23,7 @@
{ {
'name': 'Projects Management: hr_expense link', 'name': 'Projects Management: hr_expense link',
'version': '1.1', 'version': '1.1',
'category': 'Sales Management', 'category': 'Hidden',
'description': """ 'description': """
This module is for modifying project view to show some data related to the hr_expense module. This module is for modifying project view to show some data related to the hr_expense module.
====================================================================================================== ======================================================================================================

2
addons/analytic_contract_hr_expense/__openerp__.py
View File

@ -23,7 +23,7 @@
{ {
'name': 'Contracts Management: hr_expense link', 'name': 'Contracts Management: hr_expense link',
'version': '1.1', 'version': '1.1',
'category': 'Sales Management', 'category': 'Hidden',
'description': """ 'description': """
This module is for modifying account analytic view to show some data related to the hr_expense module. This module is for modifying account analytic view to show some data related to the hr_expense module.
====================================================================================================== ======================================================================================================

1
addons/analytic_contract_project/__openerp__.py
View File

@ -23,6 +23,7 @@
"name" : "Contract On Project", "name" : "Contract On Project",
"version": "1.1", "version": "1.1",
"author" : "OpenERP SA", "author" : "OpenERP SA",
'category': 'Hidden',
"website" : "http://www.openerp.com", "website" : "http://www.openerp.com",
"depends" : ["project", "account_analytic_analysis"], "depends" : ["project", "account_analytic_analysis"],
"description": """ "description": """

14
addons/crm/crm_lead_view.xml
View File

@ -289,7 +289,7 @@
<t t-name="kanban-box"> <t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
<div class="oe_dropdown_toggle oe_dropdown_kanban"> <div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span> <span class="oe_e">í</span>
<ul class="oe_dropdown_menu"> <ul class="oe_dropdown_menu">
<li><a type="edit" >Edit...</a></li> <li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li> <li><a type="delete">Delete</a></li>
@ -311,18 +311,14 @@
<field name="partner_id"/> <field name="partner_id"/>
</div> </div>
<div style="padding-left: 0.5em"> <div style="padding-left: 0.5em">
<i>
<t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t> <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
<span t-attf-class="#{red || ''}"> <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
<field name="date_action"/>
</span>
<t t-if="record.date_action.raw_value"> : </t> <t t-if="record.date_action.raw_value"> : </t>
<field name="title_action"/> <field name="title_action"/>
</i>
</div> </div>
<div class="oe_right"> <div class="oe_right">
<a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/> <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
<a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.7; filter:alpha(opacity=70);"/> <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
<!-- <!--
<t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t> <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
<span t-attf-class="oe_kanban_status #{red}"> </span> <span t-attf-class="oe_kanban_status #{red}"> </span>
@ -471,7 +467,7 @@
<label for="planned_revenue" class="oe_edit_only"/> <label for="planned_revenue" class="oe_edit_only"/>
<h2> <h2>
<field name="planned_revenue" class="oe_inline"/> <field name="planned_revenue" class="oe_inline"/>
<field name="company_currency" class="oe_edit_only oe_inline"/> at <field name="company_currency" class="oe_inline"/> at
<field name="probability" class="oe_inline"/> %% success rate <field name="probability" class="oe_inline"/> %% success rate
</h2> </h2>
</div> </div>

20
addons/crm/i18n/ja.po
View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-11 07:49+0000\n" "PO-Revision-Date: 2012-07-06 04:15+0000\n"
"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15389)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: crm #. module: crm
#: view:crm.lead.report:0 #: view:crm.lead.report:0
msgid "# Leads" msgid "# Leads"
msgstr "# リード" msgstr "リード番号"
#. module: crm #. module: crm
#: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
@ -36,12 +36,12 @@ msgstr "必要なサービス"
#. module: crm #. module: crm
#: selection:crm.meeting,rrule_type:0 #: selection:crm.meeting,rrule_type:0
msgid "Monthly" msgid "Monthly"
msgstr "毎月" msgstr "月次"
#. module: crm #. module: crm
#: model:ir.model,name:crm.model_crm_case_stage #: model:ir.model,name:crm.model_crm_case_stage
msgid "Stage of case" msgid "Stage of case"
msgstr "お問い合わせ対応状況" msgstr "案件のステージ"
#. module: crm #. module: crm
#: view:crm.meeting:0 #: view:crm.meeting:0
@ -82,7 +82,7 @@ msgstr " "
#. module: crm #. module: crm
#: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
msgid "Delay to close" msgid "Delay to close"
msgstr "" msgstr "閉鎖の遅延"
#. module: crm #. module: crm
#: view:crm.lead:0 #: view:crm.lead:0
@ -114,13 +114,13 @@ msgstr "日"
#. module: crm #. module: crm
#: sql_constraint:crm.case.section:0 #: sql_constraint:crm.case.section:0
msgid "The code of the sales team must be unique !" msgid "The code of the sales team must be unique !"
msgstr "" msgstr "営業チームのコードは固有である必要があります。"
#. module: crm #. module: crm
#: code:addons/crm/crm_lead.py:553 #: code:addons/crm/crm_lead.py:553
#, python-format #, python-format
msgid "Lead '%s' has been converted to an opportunity." msgid "Lead '%s' has been converted to an opportunity."
msgstr "" msgstr "リード %s はオポチュニティに変換されました。"
#. module: crm #. module: crm
#: code:addons/crm/crm_lead.py:294 #: code:addons/crm/crm_lead.py:294

10
addons/crm_claim/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-06-09 18:59+0000\n" "PO-Revision-Date: 2012-07-06 04:04+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15376)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: crm_claim #. module: crm_claim
#: field:crm.claim.report,nbr:0 #: field:crm.claim.report,nbr:0
@ -249,7 +249,7 @@ msgstr "次のアクション"
#. module: crm_claim #. module: crm_claim
#: view:crm.claim.report:0 #: view:crm.claim.report:0
msgid "My Sales Team(s)" msgid "My Sales Team(s)"
msgstr "私の販売チーム" msgstr "私の営業チーム"
#. module: crm_claim #. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim3 #: model:crm.case.stage,name:crm_claim.stage_claim3
@ -670,7 +670,7 @@ msgstr "クレームを検索する"
#: field:crm.claim,section_id:0 #: field:crm.claim,section_id:0
#: view:crm.claim.report:0 #: view:crm.claim.report:0
msgid "Sales Team" msgid "Sales Team"
msgstr "販売チーム" msgstr "営業チーム"
#. module: crm_claim #. module: crm_claim
#: selection:crm.claim.report,month:0 #: selection:crm.claim.report,month:0

12
addons/crm_fundraising/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-06-09 19:04+0000\n" "PO-Revision-Date: 2012-07-06 04:05+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15376)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: crm_fundraising #. module: crm_fundraising
#: field:crm.fundraising,planned_revenue:0 #: field:crm.fundraising,planned_revenue:0
@ -236,7 +236,7 @@ msgstr "最低"
#: view:crm.fundraising:0 #: view:crm.fundraising:0
#: view:crm.fundraising.report:0 #: view:crm.fundraising.report:0
msgid "My Sales Team(s)" msgid "My Sales Team(s)"
msgstr "私の販売チーム" msgstr "私の営業チーム"
#. module: crm_fundraising #. module: crm_fundraising
#: field:crm.fundraising,create_date:0 #: field:crm.fundraising,create_date:0
@ -626,7 +626,7 @@ msgstr "責任者"
msgid "" msgid ""
"Sales team to which Case belongs to. Define Responsible user and Email " "Sales team to which Case belongs to. Define Responsible user and Email "
"account for mail gateway." "account for mail gateway."
msgstr "案件が割当てられた販売チーム。担当ユーザとEメール・アカウントを指定します。" msgstr "案件が割当てられた営業チーム。担当ユーザとEメール・アカウントを指定します。"
#. module: crm_fundraising #. module: crm_fundraising
#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
@ -763,7 +763,7 @@ msgstr "高い"
#: field:crm.fundraising,section_id:0 #: field:crm.fundraising,section_id:0
#: view:crm.fundraising.report:0 #: view:crm.fundraising.report:0
msgid "Sales Team" msgid "Sales Team"
msgstr "販売チーム" msgstr "営業チーム"
#. module: crm_fundraising #. module: crm_fundraising
#: field:crm.fundraising.report,create_date:0 #: field:crm.fundraising.report,create_date:0

14
addons/crm_helpdesk/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-28 19:12+0000\n" "PO-Revision-Date: 2012-07-06 04:05+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15316)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: crm_helpdesk #. module: crm_helpdesk
#: field:crm.helpdesk.report,delay_close:0 #: field:crm.helpdesk.report,delay_close:0
@ -207,7 +207,7 @@ msgstr "Eメールの数"
#: view:crm.helpdesk:0 #: view:crm.helpdesk:0
#: view:crm.helpdesk.report:0 #: view:crm.helpdesk.report:0
msgid "My Sales Team(s)" msgid "My Sales Team(s)"
msgstr "私の販売チーム" msgstr "私の営業チーム"
#. module: crm_helpdesk #. module: crm_helpdesk
#: field:crm.helpdesk,create_date:0 #: field:crm.helpdesk,create_date:0
@ -533,7 +533,7 @@ msgstr "催促を送る"
msgid "" msgid ""
"Sales team to which Case belongs to. Define " "Sales team to which Case belongs to. Define "
"Responsible user and Email account for mail gateway." "Responsible user and Email account for mail gateway."
msgstr "事象を割り当てる販売チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。" msgstr "事象を割り当てる営業チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。"
#. module: crm_helpdesk #. module: crm_helpdesk
#: view:crm.helpdesk:0 #: view:crm.helpdesk:0
@ -708,7 +708,7 @@ msgstr "高い"
#: field:crm.helpdesk,section_id:0 #: field:crm.helpdesk,section_id:0
#: view:crm.helpdesk.report:0 #: view:crm.helpdesk.report:0
msgid "Sales Team" msgid "Sales Team"
msgstr "販売チーム" msgstr "営業チーム"
#. module: crm_helpdesk #. module: crm_helpdesk
#: field:crm.helpdesk,date_action_last:0 #: field:crm.helpdesk,date_action_last:0

8
addons/crm_partner_assign/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-25 04:47+0000\n" "PO-Revision-Date: 2012-07-06 04:06+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15505)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: crm_partner_assign #. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,send_to:0 #: field:crm.lead.forward.to.partner,send_to:0
@ -858,7 +858,7 @@ msgstr "高"
#: field:crm.lead.report.assign,section_id:0 #: field:crm.lead.report.assign,section_id:0
#: field:crm.partner.report.assign,section_id:0 #: field:crm.partner.report.assign,section_id:0
msgid "Sales Team" msgid "Sales Team"
msgstr "販売チーム" msgstr "営業チーム"
#. module: crm_partner_assign #. module: crm_partner_assign
#: field:crm.lead.report.assign,create_date:0 #: field:crm.lead.report.assign,create_date:0

10
addons/crm_profiling/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:04+0000\n" "PO-Revision-Date: 2012-07-06 04:06+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15225)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: crm_profiling #. module: crm_profiling
#: view:crm_profiling.questionnaire:0 #: view:crm_profiling.questionnaire:0
@ -30,7 +30,7 @@ msgid ""
"segmentation tool allows you to automatically assign a partner to a category " "segmentation tool allows you to automatically assign a partner to a category "
"according to his answers to the different questionnaires." "according to his answers to the different questionnaires."
msgstr "" msgstr ""
"特定のトピックに関連した質問票を作成して、それを使って販売チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート" "特定のトピックに関連した質問票を作成して、それを使って営業チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート"
"ナを自動的に区分することができます。" "ナを自動的に区分することができます。"
#. module: crm_profiling #. module: crm_profiling

8
addons/delivery/delivery_view.xml
View File

@ -257,13 +257,15 @@
<field name="inherit_id" ref="sale.view_order_form"/> <field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group[@name='sale_total']" position="after"> <xpath expr="//group[@name='sale_total']" position="after">
<group> <group width="50%%">
<label for="carrier_id"/> <label for="carrier_id"/>
<div> <div>
<field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/> <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
<button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/> <button name="delivery_set" states="draft" string="Charge in Sale Order" type="object"
attrs="{'invisible':[('carrier_id','=',False)]}"/>
</div> </div>
<label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/> <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order(s)." colspan="2"
attrs="{'invisible':[('carrier_id','=',False)]}"/>
</group> </group>
</xpath> </xpath>
</field> </field>

26
addons/edi/i18n/ar.po
View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-04-06 00:12+0000\n" "PO-Revision-Date: 2012-07-06 02:21+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Ahmad Khayyat <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n" "Language-Team: Arabic <ar@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-07 04:56+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15060)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: edi #. module: edi
#: sql_constraint:res.currency:0 #: sql_constraint:res.currency:0
msgid "The currency code must be unique per company!" msgid "The currency code must be unique per company!"
msgstr "" msgstr "يجب أن يكون رمز العملة فريداً للشركة!"
#. module: edi #. module: edi
#: model:ir.model,name:edi.model_res_partner_address #: model:ir.model,name:edi.model_res_partner_address
@ -30,12 +30,12 @@ msgstr "عناوين الشريك"
#. module: edi #. module: edi
#: sql_constraint:res.company:0 #: sql_constraint:res.company:0
msgid "The company name must be unique !" msgid "The company name must be unique !"
msgstr "اسم الشركة يجب أن يكون فريداً !" msgstr "يجب أن يكون اسم الشركة فريداً !"
#. module: edi #. module: edi
#: constraint:res.partner:0 #: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members." msgid "Error ! You cannot create recursive associated members."
msgstr "" msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
#. module: edi #. module: edi
#: field:edi.document,name:0 #: field:edi.document,name:0
@ -111,12 +111,12 @@ msgstr "مستند"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
msgid "View/Print" msgid "View/Print"
msgstr "" msgstr "عرض/طباعة"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
msgid "Import this document" msgid "Import this document"
msgstr "" msgstr "إستيراد هذه الوثيقة"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
@ -126,7 +126,7 @@ msgstr ""
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
msgid "OpenERP instance address:" msgid "OpenERP instance address:"
msgstr "عنوان مثال أوبنيرب:" msgstr "عنوان نسخة أوبن إي آر بي:"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
@ -177,7 +177,7 @@ msgstr ""
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
msgid "OpenERP documentation" msgid "OpenERP documentation"
msgstr "وثائق أوبنيرب" msgstr "توثيق أوبن إي آر بي"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
@ -202,12 +202,12 @@ msgstr "تحميل"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
msgid "Powered by" msgid "Powered by"
msgstr "مدعوم من kifcaliph و" msgstr "يتم تشغيل هذا التطبيق بواسطة"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
msgid "OpenERP" msgid "OpenERP"
msgstr "أوبنيرب" msgstr "أوبن إي آر بي"
#. openerp-web #. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34

18
addons/edi/static/src/css/edi.css
View File

@ -24,21 +24,6 @@ button.oe_edi_action_print img {
height: 32px; height: 32px;
} }
.openerp input.invalid {
background-color: #F66 !important;
border: 1px solid #D00 !important;
color: #000;
}
/* following browse-specific hacks need to be separate rules, as browsers are
required to ignore rules with unknown selectors. At time of writing, there
is no standard way to style HTML5 placeholders */
.openerp input.invalid:-moz-placeholder {
color: #FFF;
}
.openerp input.invalid::-webkit-input-placeholder {
color: #FFF;
}
/** EDI Sidebar **/ /** EDI Sidebar **/
.oe_edi_sidebar_title { .oe_edi_sidebar_title {
border-bottom: 1px solid #D2CFCF; border-bottom: 1px solid #D2CFCF;
@ -81,9 +66,6 @@ button.oe_edi_action_print img {
/** Paperbox, from http://www.sitepoint.com/pure-css3-paper-curl/ **/ /** Paperbox, from http://www.sitepoint.com/pure-css3-paper-curl/ **/
body {
background: #EEE; /* contrast with paper */
}
.oe_edi_paperbox { .oe_edi_paperbox {
position: relative; position: relative;
width: 700px; width: 700px;

4
addons/hr/hr_department_view.xml
View File

@ -13,12 +13,14 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="department" version="7.0"> <form string="department" version="7.0">
<sheet>
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="parent_id"/>
<field name="manager_id"/> <field name="manager_id"/>
<field name="parent_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group> </group>
</sheet>
</form> </form>
</field> </field>
</record> </record>

102
addons/hr/hr_view.xml
View File

@ -20,58 +20,62 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Employee" version="7.0"> <form string="Employee" version="7.0">
<sheet> <sheet>
<div class="oe_right oe_button_box"> <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>
<div class="oe_right oe_button_box" name="button_box">
<!-- Put here related buttons --> <!-- Put here related buttons -->
</div> </div>
<field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1> <h1>
<field name="name" class="oe_inline"/>
<label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/> <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
<h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2> <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
<label class="oe_inline" string="at" attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
<field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
</h1>
<label for="department_id" class="oe_edit_only"/> <label for="department_id" class="oe_edit_only"/>
<h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2> <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
<label for="category_ids" class="oe_edit_only"/>
<h3><field name="category_ids" widget="many2many_tags"/></h3>
</div> </div>
<notebook> <group colspan="4" col="4">
<page string="Personal Information">
<group>
<group string="General">
<field name="user_id" on_change="onchange_user(user_id)"/>
<field name="active"/>
<field name="parent_id"/>
</group>
<group groups="base.group_hr_user" string="Social IDs">
<field name="identification_id"/>
<field name="passport_id"/>
<field name="otherid"/>
</group>
<group groups="base.group_hr_user" string="Status">
<field name="gender"/>
<field name="marital"/>
<field name="country_id"/>
<field name="birthday"/>
</group>
<group string="Contact Information">
<field name="address_home_id"/>
<field name="address_id" on_change="onchange_address_id(address_id)"/>
<field name="work_phone"/>
<field name="mobile_phone"/>
<field name="work_email" widget="email" /> <field name="work_email" widget="email" />
<field name="work_location"/> <field name="work_phone"/>
<field name="address_id" on_change="onchange_address_id(address_id)" />
<field name="mobile_phone"/>
</group> </group>
<group name="job_information" string="Job Information"> <notebook>
<field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/> <page string="Information">
<group>
<group>
<field name="user_id" on_change="onchange_user(user_id)"/>
<field name="parent_id" />
<field name="coach_id"/> <field name="coach_id"/>
</group> </group>
<group>
<field name="identification_id" groups="base.group_hr_user"/>
<field name="passport_id" groups="base.group_hr_user"/>
<field name="otherid" groups="base.group_hr_user"/>
</group> </group>
<group name="active_group">
<field name="active"/>
</group>
</group>
<field name="notes" placeholder="Other Information ..." colspan="4"/>
</page> </page>
<page string="Categories" groups="base.group_hr_user"> <page string="Personal Information" groups="base.group_hr_user">
<field name="category_ids" widget="many2many_tags"/> <group col="4">
</page> <group>
<page string="Notes" groups="base.group_hr_user"> <field name="country_id"/>
<field name="notes"/> <field name="bank_account_id"/>
<field name="address_home_id"/>
</group>
<group>
<field name="gender"/>
<field name="marital"/>
<field name="birthday"/>
</group>
</group>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -361,16 +365,21 @@
<field name="state" widget="statusbar" statusbar_visible="recruit,open"/> <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
</header> </header>
<sheet> <sheet>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
<label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
<field name="department_id" class="oe_inline"/>
<label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
</h1>
<group> <group>
<group> <group>
<field name="name"/>
<field name="department_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
<field name="no_of_employee"/> <field name="no_of_employee"/>
<field name="expected_employees"/> <field name="expected_employees"/>
<field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
</group>
<group>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group> </group>
</group> </group>
<notebook> <notebook>
@ -380,9 +389,6 @@
<label for="requirements"/> <label for="requirements"/>
<field name="requirements"/> <field name="requirements"/>
</page> </page>
<page string="Employees" groups="base.group_user">
<field name="employee_ids" widget="many2many" mode="tree,form"/>
</page>
</notebook> </notebook>
</sheet> </sheet>
</form> </form>

13
addons/hr_attendance/hr_attendance_view.xml
View File

@ -133,12 +133,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr.view_employee_form"/> <field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="coach_id" position="after"> <field name="active" position="before">
<group colspan="2"> <label for="state"/>
<field name="state"/> <div>
<button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/> <field name="state" class="oe_inline"/>
<button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/> <button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
</group> <button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
</div>
</field> </field>
</field> </field>
</record> </record>

2
addons/hr_contract/hr_contract.py
View File

@ -44,7 +44,7 @@ class hr_employee(osv.osv):
'place_of_birth': fields.char('Place of Birth', size=30), 'place_of_birth': fields.char('Place of Birth', size=30),
'children': fields.integer('Number of Children'), 'children': fields.integer('Number of Children'),
'vehicle': fields.char('Company Vehicle', size=64), 'vehicle': fields.char('Company Vehicle', size=64),
'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"), 'vehicle_distance': fields.integer('Home-Work Dist.', help="In kilometers"),
'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'), 'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'), 'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
} }

79
addons/hr_contract/hr_contract_view.xml
View File

@ -8,30 +8,32 @@
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/> <field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="Personal Information" position="after"> <data>
<page string="Miscellaneous" groups="base.group_hr_user"> <xpath expr="//field[@name='parent_id']" position="before">
<group colspan="2" col="2">
<separator string="Personal Info" colspan="2"/>
<field name="bank_account_id"/>
<field name="place_of_birth"/>
<field name="children"/>
</group>
<group colspan="2" col="2">
<separator string="Job Info" colspan="2"/>
<field name="manager"/> <field name="manager"/>
</xpath>
<xpath expr="//group[@name='active_group']" position="before">
<group>
<field name="vehicle"/> <field name="vehicle"/>
<field name="vehicle_distance"/> <field name="vehicle_distance"/>
</group> </group>
<group colspan="2" col="2"> </xpath>
<separator string="Others Info" colspan="2"/> <field name="active" position="before">
<field name="medic_exam" /> <field name="medic_exam" string="Medical Exam"/>
</group> </field>
</page> <field name="birthday" position="before">
</page> <field name="children"/>
</field>
<field name="birthday" position="after">
<field name="place_of_birth"/>
</field>
<field name="bank_account_id" position="replace">
<field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
</field>
</data>
</field> </field>
</record> </record>
<record id="hr_contract_view_search" model="ir.ui.view"> <record id="hr_contract_view_search" model="ir.ui.view">
<field name="name">hr.contract.view.search</field> <field name="name">hr.contract.view.search</field>
<field name="model">hr.contract</field> <field name="model">hr.contract</field>
@ -67,34 +69,45 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Contract" version="7.0"> <form string="Contract" version="7.0">
<sheet> <sheet>
<group col="4"> <div class="oe_title">
<field name="name" /> <h1>
<field name="employee_id" /> <field name="name" class="oe_inline"/>, <field name="employee_id" class="oe_inline"/>
</h1>
<h2>
<div>
<label for="job_id" class="oe_edit_only"/>
<field name="job_id"/> <field name="job_id"/>
<field name="wage"/> </div>
<div>
<label for="type_id" class="oe_edit_only"/>
<field name="type_id"/> <field name="type_id"/>
</group> </div>
</h2>
</div>
<notebook> <notebook>
<page string="Information" name="information"> <page string="Information" name="information">
<group> <group>
<group name="left_column" string="Duration"> <group name="salary_and_advantages" string="Salary and Advantages">
<field name="date_start" /> <field name="wage"/>
<field name="date_end" /> <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
</group>
<group name="duration_group" string="Duration">
<label for="trial_date_start" string="Trial Period Duration"/>
<div>
<field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
</div>
<label for="date_start" string="Duration"/>
<div>
<field name="date_start" class="oe_inline"/> - <field name="date_end" class="oe_inline"/>
</div>
<field name="working_hours"/> <field name="working_hours"/>
</group> </group>
<group string="Trial Period">
<field name="trial_date_start" />
<field name="trial_date_end" />
</group>
<group name="right_column" string="Advantages">
<field name="advantages" nolabel="1" colspan="2"/>
</group>
</group> </group>
<separator string="Notes"/> <separator string="Notes"/>
<field name="notes"/> <field name="notes"/>
</page> </page>
<page string="Work Permit"> <page string="Work Permit">
<group string="Valid for"> <group col="4">
<field name="visa_no"/> <field name="visa_no"/>
<field name="permit_no"/> <field name="permit_no"/>
<field name="visa_expire"/> <field name="visa_expire"/>

69
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -28,11 +28,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Appraisal Plan" version="7.0"> <form string="Appraisal Plan" version="7.0">
<group col="4"> <group col="4">
<group>
<field name="name"/> <field name="name"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="active"/>
</group>
<group>
<field name="month_first"/> <field name="month_first"/>
<field name="month_next"/> <field name="month_next"/>
<field name="active"/> </group>
</group> </group>
<notebook> <notebook>
<page string="Appraisal Phases"> <page string="Appraisal Phases">
@ -133,10 +137,12 @@
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/> <field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="Notes" position="before"> <page string="Personal Information" position="after">
<page string="Appraisal" groups="base.group_hr_user"> <page string="Appraisal" groups="base.group_hr_user">
<group col="4">
<field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/> <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
<field name="evaluation_date"/> <field name="evaluation_date"/>
</group>
</page> </page>
</page> </page>
</field> </field>
@ -157,33 +163,35 @@
<field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
</header> </header>
<sheet> <sheet>
<label for="employee_id" class="oe_edit_only"/>
<h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
<label for="plan_id" class="oe_edit_only"/>
<h2><field name="plan_id"/></h2>
<group> <group>
<group string="Appraisal Data"> <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="plan_id"/>
<field name="date"/>
</group>
<group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}" string="Ending Summary">
<field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/> <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
<field name="date_close" readonly="1"/> <field name="date_close" readonly="1"/>
</group> </group>
</group> </group>
<notebook> <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
<page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}"> <field nolabel="1" name="survey_request_ids">
<field name="survey_request_ids">
<form string="Interview Appraisal" version="7.0"> <form string="Interview Appraisal" version="7.0">
<group col="4"> <div class="oe_right oe_button_box">
<field name="survey_id"/>
<div colspan="2">
<button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/> <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" /> <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
</div> </div>
<field name="date_deadline"/> <group>
<field name="response" readonly="1"/> <group>
<field name="survey_id"/>
<field name="user_to_review_id"/> <field name="user_to_review_id"/>
<field name="user_id" string="Interviewer"/> <field name="user_id" string="Interviewer"/>
</group> </group>
<group col="4" string="Status"> <group>
<field name="date_deadline"/>
<field name="response" readonly="1"/>
</group>
</group>
<group col="4" string="Status" invisible="1">
<field name="state"/> <field name="state"/>
<div> <div>
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" /> <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
@ -191,15 +199,14 @@
</group> </group>
</form> </form>
</field> </field>
</page> </group>
<page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}"> <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
<field name="note_action" <field nolabel="1" name="note_action"
groups="base.group_hr_manager"/> groups="base.group_hr_manager" placeholder="Appraisal Summary..."/>
</page> </group>
<page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}"> <group string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
<field name="note_summary"/> <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
</page> </group>
</notebook>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -279,13 +286,17 @@
<field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/> <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
</header> </header>
<sheet> <sheet>
<group col="4"> <group>
<group>
<field name="survey_id"/>
<field name="user_to_review_id"/> <field name="user_to_review_id"/>
<field name="user_id" string="Interviewer"/> <field name="user_id" string="Interviewer"/>
</group>
<group>
<field name="date_deadline"/> <field name="date_deadline"/>
<field name="survey_id"/>
<field name="evaluation_id"/>
<field name="response" readonly="1"/> <field name="response" readonly="1"/>
<field name="evaluation_id" string="Appraisal Plan"/>
</group>
</group> </group>
</sheet> </sheet>
</form> </form>

2
addons/hr_expense/hr_expense.py
View File

@ -56,12 +56,12 @@ class hr_expense_expense(osv.osv):
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0] return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
_name = "hr.expense.expense" _name = "hr.expense.expense"
_inherit = ['mail.thread']
_description = "Expense" _description = "Expense"
_order = "id desc" _order = "id desc"
_columns = { _columns = {
'name': fields.char('Description', size=128, required=True), 'name': fields.char('Description', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True), 'id': fields.integer('Sheet ID', readonly=True),
'ref': fields.char('Reference', size=32),
'date': fields.date('Date', select=True), 'date': fields.date('Date', select=True),
'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"), 'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
'employee_id': fields.many2one('hr.employee', "Employee", required=True), 'employee_id': fields.many2one('hr.employee', "Employee", required=True),

53
addons/hr_expense/hr_expense_view.xml
View File

@ -49,7 +49,6 @@
<field name="employee_id"/> <field name="employee_id"/>
<field name="date"/> <field name="date"/>
<field name="department_id"/> <field name="department_id"/>
<field name="ref"/>
<field name="name"/> <field name="name"/>
<field name="amount"/> <field name="amount"/>
<field name="state"/> <field name="state"/>
@ -74,38 +73,44 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header> </header>
<sheet> <sheet>
<group col="4"> <group>
<group>
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/> <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="name"/>
<field name="ref"/>
<field name="date"/> <field name="date"/>
<field name="currency_id"/>
<field name="department_id"/> <field name="department_id"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</group> </group>
<group>
<field name="name"/>
<field name="user_valid"/>
<field name="currency_id"/>
</group>
</group>
<notebook> <notebook>
<page string="Description"> <page string="Description">
<field name="line_ids" context="{'currency_id': currency_id}"> <field name="line_ids" context="{'currency_id': currency_id}">
<form string="Expense Lines" version="7.0"> <form string="Expense Lines" version="7.0">
<group col="6" colspan="4"> <group>
<group>
<field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/> <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
<field name="name" colspan="4"/> <field name="name"/>
<newline/>
<field name="unit_amount"/>
<field name="unit_quantity"/>
<field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)"/>
</group>
<group colspan="2" col="2" groups="analytic.group_analytic_accounting">
<separator string="Customer Project" colspan="2"/>
<field domain="[('type','in',['normal','contract'])]" name="analytic_account"/>
</group>
<group colspan="2" col="2">
<separator string="References" colspan="2"/>
<field name="date_value" />
<field name="ref"/> <field name="ref"/>
<field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
</group>
<group>
<field name="unit_amount"/>
<label for="unit_quantity"/>
<div>
<field name="unit_quantity" class="oe_inline"/>
<field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
</div>
<field name="date_value" />
</group>
</group> </group>
</form> </form>
</field> </field>
<separator string="Notes"/>
<field name="note" placeholder="Free Notes"/>
</page> </page>
<page string="Other Info"> <page string="Other Info">
<group> <group>
@ -113,17 +118,13 @@
<field name="journal_id"/> <field name="journal_id"/>
<field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/> <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
</group> </group>
<group groups="base.group_no_one" string="Validation">
<field name="date_confirm" readonly="1"/>
<field name="date_valid" readonly="1"/>
<field name="user_valid"/>
</group> </group>
</group>
<separator string="Notes"/>
<field name="note"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<footer>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form> </form>
</field> </field>
</record> </record>

4
addons/hr_expense/report/expense.rml
View File

@ -160,7 +160,7 @@
<para style="terp_tblheader_General_Centre">Date</para> <para style="terp_tblheader_General_Centre">Date</para>
</td> </td>
<td> <td>
<para style="terp_tblheader_General_Centre">Reference</para> <para style="terp_tblheader_General_Centre">Description</para>
</td> </td>
<td> <td>
<para style="terp_tblheader_General_Centre">Validated By</para> <para style="terp_tblheader_General_Centre">Validated By</para>
@ -176,7 +176,7 @@
<para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para> <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Centre_8">[[ o.ref ]]</para> <para style="terp_default_Centre_8">[[ o.name ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para> <para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>

66
addons/hr_holidays/hr_holidays_view.xml
View File

@ -110,29 +110,39 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
</header> </header>
<sheet string="Leave Request"> <sheet string="Leave Request">
<group col="8" colspan="4"> <group>
<group>
<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/> <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/> <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
<group attrs="{'invisible':[('holiday_type','=','employee')]}"> <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/> <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
<field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
</group> </group>
<group attrs="{'invisible':[('holiday_type','=','category')]}"> <group>
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/> <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
<label for="number_of_days_temp" string="Duration"/>
<div>
<field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> -
<field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
<div>
<field name="number_of_days_temp" class="oe_inline"/> days
</div>
</div>
</group> </group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General"> <page string="General">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/> <group>
<field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/> <group>
<field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="number_of_days_temp"/>
<field name="double_validation" invisible="1"/>
<newline/>
<field name="manager_id" groups="base.group_no_one"/> <field name="manager_id" groups="base.group_no_one"/>
<field name="double_validation" invisible="1"/>
</group>
<group>
<field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/> <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
<separator string="Reasons" colspan="4"/> </group>
<field name="notes" nolabel="1" colspan="4"/> </group>
<newline/>
<field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -159,24 +169,27 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
</header> </header>
<sheet> <sheet>
<group>
<group> <group>
<field name="name"/> <field name="name"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/> <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/> <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/> <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
<field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
</group>
<group>
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
<field name="number_of_days_temp"/>
</group>
</group> </group>
<notebook> <notebook>
<page string="General"> <page string="General">
<group col="4"> <group col="4">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
<field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
<field name="number_of_days_temp"/>
<field name="double_validation" invisible="1"/> <field name="double_validation" invisible="1"/>
<field name="manager_id"/> <field name="manager_id"/>
<field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/> <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
</group> </group>
<separator string="Reasons"/> <field name="notes" placeholder="Add a reason..."/>
<field name="notes"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -342,7 +355,7 @@
<record model="ir.actions.act_window.view" id="action_request_approve_holidays_form"> <record model="ir.actions.act_window.view" id="action_request_approve_holidays_form">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="allocation_leave_new"/> <field name="view_id" ref="edit_holiday_new"/>
<field name="act_window_id" ref="request_approve_holidays"/> <field name="act_window_id" ref="request_approve_holidays"/>
</record> </record>
@ -409,8 +422,7 @@
<form string="Leave Type" version="7.0"> <form string="Leave Type" version="7.0">
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="color_name"/> <field name="categ_id"/>
<field name="categ_id" widget="selection"/>
</group> </group>
<notebook> <notebook>
<page string="Details"> <page string="Details">
@ -420,6 +432,7 @@
<field name="limit"/> <field name="limit"/>
</group> </group>
<group name="second" string="Misc"> <group name="second" string="Misc">
<field name="color_name"/>
<field name="active"/> <field name="active"/>
</group> </group>
</group> </group>
@ -529,8 +542,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr.view_employee_form"/> <field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="coach_id" position="after"> <field name="active" position="before">
<field name="remaining_leaves"/> <label for="remaining_leaves"/>
<div>
<field name="remaining_leaves" class="oe_inline"/>
<label/>
<button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
</div>
</field> </field>
</field> </field>
</record> </record>

94
addons/hr_payroll/hr_payroll_view.xml
View File

@ -7,36 +7,6 @@
<menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/> <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
<menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/> <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
<!-- Employee View -->
<record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@string='Personal Information']" position="after">
<page string="Miscellaneous" groups="base.group_hr_user">
<group colspan="2" col="2">
<separator string="Personal Info" colspan="2"/>
<field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
<field name="place_of_birth"/>
<field name="children"/>
<!-- <field name="basic" invisible="0"/> -->
</group>
<group colspan="2" col="2">
<separator string="Job Info" colspan="2"/>
<field name="manager" />
<field name="vehicle" />
<field name="vehicle_distance" />
<field name="medic_exam" string="Medical Examination"/>
</group>
</page>
</xpath>
</data>
</field>
</record>
<!-- End Employee View -->
<!-- Contract View --> <!-- Contract View -->
<record id="hr_contract_form_inherit" model="ir.ui.view"> <record id="hr_contract_form_inherit" model="ir.ui.view">
<field name="name">hr.contract.view.form.inherit</field> <field name="name">hr.contract.view.form.inherit</field>
@ -45,8 +15,7 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/> <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="//group[@name='right_column']" position="before"> <xpath expr="//field[@name='wage']" position="after">
<separator string="Payslip Info" colspan="2"/>
<field name="struct_id" required="1"/> <field name="struct_id" required="1"/>
</xpath> </xpath>
<xpath expr="//field[@name='working_hours']" position="after"> <xpath expr="//field[@name='working_hours']" position="after">
@ -105,7 +74,7 @@
<field name="model">hr.payroll.structure</field> <field name="model">hr.payroll.structure</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Employee Function"> <form string="Employee Function" version="7.0">
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="code"/> <field name="code"/>
@ -250,6 +219,12 @@
</field> </field>
</record> </record>
<act_window name="Payslip Computation Details"
context="{'default_slip_id': active_id,'search_default_slip_id': active_id}"
res_model="hr.payslip.line"
src_model="hr.payslip"
id="act_payslip_lines"/>
<record id="view_hr_payslip_form" model="ir.ui.view"> <record id="view_hr_payslip_form" model="ir.ui.view">
<field name="name">hr.payslip.form</field> <field name="name">hr.payslip.form</field>
<field name="model">hr.payslip</field> <field name="model">hr.payslip</field>
@ -265,13 +240,18 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header> </header>
<sheet> <sheet>
<div class="oe_right oe_button_box">
<button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
</div>
<div class="oe_title">
<label for="employee_id" class="oe_edit_only"/> <label for="employee_id" class="oe_edit_only"/>
<h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1> <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
<label for="date_from" class="oe_edit_only" string="Period"/> <label for="date_from" class="oe_edit_only" string="Period"/>
<h2> <h2>
from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/> From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
to <field name="date_to"/> to <field name="date_to"/>
</h2> </h2>
</div>
<group col="4"> <group col="4">
<field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/> <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
<field name="number"/> <field name="number"/>
@ -281,6 +261,7 @@
</group> </group>
<notebook> <notebook>
<page string="Worked Days &amp; Inputs"> <page string="Worked Days &amp; Inputs">
<separator string="Worked Days"/>
<field name="worked_days_line_ids"> <field name="worked_days_line_ids">
<tree string="Worked Days" editable="bottom"> <tree string="Worked Days" editable="bottom">
<field name="name"/> <field name="name"/>
@ -302,6 +283,7 @@
</group> </group>
</form> </form>
</field> </field>
<separator string="Other Inputs"/>
<field name="input_line_ids" colspan="4" nolabel="1"> <field name="input_line_ids" colspan="4" nolabel="1">
<tree string="Input Data" editable="bottom"> <tree string="Input Data" editable="bottom">
<field name="name"/> <field name="name"/>
@ -360,14 +342,18 @@
</field> </field>
</page> </page>
<page string="Other Information"> <page string="Other Information">
<group col="2" string="Other Information"> <group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <group string="Miscellaneous">
<field name="company_id" groups="base.group_multi_company"/>
<field name="payslip_run_id" domain="[('state','=','draft')]"/> <field name="payslip_run_id" domain="[('state','=','draft')]"/>
</group>
<group name="accounting" string="Accounting">
<field name="paid" readonly="1"/> <field name="paid" readonly="1"/>
</group> </group>
<group string="Notes">
<field name="note"/>
</group> </group>
<div colspan="4">
<field name="note" Placeholder="Add an internal note..."/>
</div>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -413,7 +399,27 @@
<field name="search_view_id" ref="view_hr_payslip_filter"/> <field name="search_view_id" ref="view_hr_payslip_filter"/>
</record> </record>
<menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/> <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
<act_window name="Payslips"
context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
res_model="hr.payslip"
src_model="hr.employee"
view_id ="view_hr_payslip_tree"
id="act_hr_employee_payslip_list"
groups="base.group_hr_manager"/>
<!-- Employee View -->
<record id="payroll_hr_employee_view_form" model="ir.ui.view">
<field name="name">payroll.hr.employee.view.form</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//div[@name='button_box']" position="inside">
<button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
</xpath>
</data>
</field>
</record>
<!-- Salary Category--> <!-- Salary Category-->
<record id="hr_salary_rule_category_form" model="ir.ui.view"> <record id="hr_salary_rule_category_form" model="ir.ui.view">
<field name="name">hr.salary.rule.category.form</field> <field name="name">hr.salary.rule.category.form</field>
@ -730,12 +736,20 @@
<field name="state" widget="statusbar"/> <field name="state" widget="statusbar"/>
</header> </header>
<sheet> <sheet>
<group col="4"> <label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/> <field name="name"/>
<field name="credit_note"/> </h1>
<h2>
Period from
<field name="date_start"/> <field name="date_start"/>
to
<field name="date_end"/> <field name="date_end"/>
</h2>
<group col="4">
<field name="credit_note"/>
</group> </group>
<separator string="Payslips"/>
<field name="slip_ids"/> <field name="slip_ids"/>
</sheet> </sheet>
</form> </form>

12
addons/hr_payroll_account/hr_payroll_account_view.xml
View File

@ -2,8 +2,6 @@
<openerp> <openerp>
<data> <data>
<record model="ir.ui.view" id="view_hr_payslip_inherit_form"> <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
<field name="name">hr.payslip.inherit.form</field> <field name="name">hr.payslip.inherit.form</field>
<field name="model">hr.payslip</field> <field name="model">hr.payslip</field>
@ -27,10 +25,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Child Rules']" position="after"> <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
<page string="Accounting"> <page string="Accounting">
<group colspan="4">
<field name="account_debit" /> <field name="account_debit" />
<field name="account_credit"/> <field name="account_credit"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_tax_id"/> <field name="account_tax_id"/>
</group>
</page> </page>
</xpath> </xpath>
</field> </field>
@ -44,10 +44,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/> <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='advantages']" position="after"> <xpath expr="//group[@name='duration_group']" position="after">
<separator colspan="4" string="Accounting"/> <group string="Accounting">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="journal_id"/> <field name="journal_id"/>
</group>
</xpath> </xpath>
</field> </field>
</record> </record>
@ -85,8 +86,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/> <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date_end" position="after"> <field name="credit_note" position="before">
<newline/>
<field name="journal_id"/> <field name="journal_id"/>
</field> </field>
</field> </field>

4
addons/hr_recruitment/hr_recruitment.py
View File

@ -181,7 +181,7 @@ class hr_applicant(base_stage, osv.Model):
return res return res
_columns = { _columns = {
'name': fields.char('Name', size=128, required=True), 'name': fields.char('Subject', size=128, required=True),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."), 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
'description': fields.text('Description'), 'description': fields.text('Description'),
'email_from': fields.char('Email', size=128, help="These people will receive email."), 'email_from': fields.char('Email', size=128, help="These people will receive email."),
@ -213,7 +213,7 @@ class hr_applicant(base_stage, osv.Model):
'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"), 'salary_expected_extra': fields.char('Expected Salary Extra', size=100, help="Salary Expected by Applicant, extra advantages"),
'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"), 'salary_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"), 'salary_expected': fields.float('Expected Salary', help="Salary Expected by Applicant"),
'availability': fields.integer('Availability (Days)'), 'availability': fields.integer('Availability'),
'partner_name': fields.char("Applicant's Name", size=64), 'partner_name': fields.char("Applicant's Name", size=64),
'partner_phone': fields.char('Phone', size=32), 'partner_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32), 'partner_mobile': fields.char('Mobile', size=32),

82
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -150,58 +150,58 @@
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1> <h1><field name="name"/></h1>
<label for="partner_name" class="oe_edit_only"/> <label for="partner_name" class="oe_edit_only"/>
<h2><field name="partner_name"/></h2> <h2>
<field name="type_id" placeholder="Degree"/> <field name="partner_name" class="oe_inline"/>
</h2>
</div> </div>
<group> <group>
<group> <group string="Contact Details">
<field name="user_id"/> <field name="partner_id"
<field name="title_action"/>
<field name="date_action"/>
</group>
<group>
<field name="job_id" on_change="onchange_job(job_id)"/>
<field name="priority" string="Appreciation"/>
<field name="survey" invisible="1"/>
<field name="response" invisible="1"/>
<field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
<field name="state" groups="base.group_no_one"/>
</group>
</group>
<notebook>
<page string="Application">
<group>
<group string="Contact">
<label for="partner_id"/>
<div>
<field name="partner_id" class="oe_inline"
on_change="onchange_partner_id(partner_id, email_from)"/> on_change="onchange_partner_id(partner_id, email_from)"/>
<button class="oe_inline"
string="Create" help="Create a new contact for this applicant" icon="gtk-index"
name="%(action_hr_recruitment_partner_create)d" type="action"
attrs="{'invisible':[('partner_id','!=',False)]}"/>
</div>
<field name="email_from" widget="email"/> <field name="email_from" widget="email"/>
<field name="partner_phone"/> <field name="partner_phone"/>
<field name="partner_mobile"/> <field name="partner_mobile"/>
<field name="type_id" placeholder="Degree"/>
</group>
<group string="Application Followup">
<field name="user_id"/>
<label for="title_action"/>
<div>
<field name="date_action"/> -
<field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
</div>
<field name="priority"/>
<field name="state" invisible="1"/>
</group>
<group string="Job">
<field name="survey" invisible="1"/>
<field name="response" invisible="1"/>
<field name="job_id" on_change="onchange_job(job_id)"/>
<field name="department_id" on_change="onchange_department_id(department_id)"/>
<label for="availability"/>
<div>
<field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
</div>
</group>
<group string="Contract">
<label for="salary_expected"/>
<div>
<field name="salary_expected" class="oe_inline"/>,
<field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
</div>
<label for="salary_proposed"/>
<div>
<field name="salary_proposed" class="oe_inline"/>,
<field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
</div>
</group> </group>
<group string="Reference"> <group string="Reference">
<field name="source_id"/> <field name="source_id"/>
<field name="reference"/> <field name="reference"/>
</group> </group>
<group string="Contract">
<field name="salary_expected"/>
<field name="salary_expected_extra"/>
<field name="salary_proposed"/>
<field name="salary_proposed_extra"/>
<field name="availability"/>
</group> </group>
</group> <separator string="Application Summary"/>
<separator string="Details"/> <field name="description" placeholder="Feedback of interviews..."/>
<field name="description"/>
</page>
</notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread"/>
@ -371,7 +371,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr.view_hr_job_form"/> <field name="inherit_id" ref="hr.view_hr_job_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="expected_employees" version="7.0" position="after"> <field name="no_of_recruitment" version="7.0" position="after">
<label for="survey_id" /> <label for="survey_id" />
<div> <div>
<field name="survey_id" class="oe_inline"/> <field name="survey_id" class="oe_inline"/>

29
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -26,22 +26,30 @@
<field name="model">hr.analytic.timesheet</field> <field name="model">hr.analytic.timesheet</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Timesheet Lines"> <form string="Timesheet Lines" version="7.0">
<group col="4"> <sheet>
<field name="name" colspan="4"/> <group>
<group>
<field name="name"/>
<field name="user_id" on_change="on_change_user_id(user_id)" required="1"/> <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
</group>
<group>
<field name="date" on_change="on_change_date(date)"/> <field name="date" on_change="on_change_date(date)"/>
</group> </group>
</group>
<notebook> <notebook>
<page string="Information"> <page string="Information">
<group> <group>
<group string="Product"> <group string="Product">
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/> <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/> <label string="Quantity" for="unit_amount"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/> <div>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
</div>
</group> </group>
<group string="Accounting"> <group string="Accounting">
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id"/> <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
<field name="amount"/> <field name="amount"/>
<field name="general_account_id"/> <field name="general_account_id"/>
<field name="journal_id"/> <field name="journal_id"/>
@ -49,6 +57,7 @@
</group> </group>
</page> </page>
</notebook> </notebook>
</sheet>
</form> </form>
</field> </field>
</record> </record>
@ -112,10 +121,14 @@
<field name="model">hr.employee</field> <field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/> <field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="Categories" position="after"> <page string="Personal Information" position="after">
<page string="Timesheets" groups="base.group_hr_user"> <page string="Timesheets" groups="base.group_hr_user">
<group>
<group col="2">
<field name="product_id" domain="[('type','=','service')]"/> <field name="product_id" domain="[('type','=','service')]"/>
<field name="journal_id" widget="selection"/> <field name="journal_id"/>
</group>
</group>
</page> </page>
</page> </page>
</field> </field>

65
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -62,39 +62,50 @@
<label for="employee_id" class="oe_edit_only"/> <label for="employee_id" class="oe_edit_only"/>
<h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1> <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
<label for="date_from" class="oe_edit_only" string="Timesheet Period"/> <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
<h2> <h2>From <field name="date_from"/> to <field name="date_to"/></h2>
From <field name="date_from"/> <group>
to <field name="date_to"/> <group>
</h2>
<group col="4">
<field name="name"/> <field name="name"/>
<field name="department_id"/> <field name="department_id"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</group>
<group>
<field name="total_attendance" widget="float_time"/>
<field name="total_timesheet" widget="float_time"/>
<field name="total_difference" widget="float_time"/>
<field name="user_id" invisible="1"/> <field name="user_id" invisible="1"/>
</group> </group>
</group>
<notebook> <notebook>
<page string="Daily"> <page string="Daily">
<group col="6" colspan="4"> <group>
<button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/> <div>
<field name="date_current" nolabel="1"/> <button name="button_dummy" class="oe_inline" string="Go to" type="object" icon="terp-gtk-jump-to-ltr"/> :
<label string=""/> <field name="date_current" class="oe_inline"/>
<button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/> </div>
<button name="date_today" string="Today" type="object" icon="terp-go-today"/> <div align="right">
<button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/> <button class="oe_inline" icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
<button class="oe_inline" name="date_today" string="Today" type="object" icon="terp-go-today"/>
<button class="oe_inline" icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
</div>
</group> </group>
<group colspan="4" col="3">
<field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1"> <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
<tree string="Attendances" editable="bottom"> <tree string="Attendances" editable="bottom">
<field name="name"/> <field name="name"/>
<field name="action"/> <field name="action"/>
<field invisible="1" name="employee_id"/> <field invisible="1" name="employee_id"/>
</tree> </tree>
</field> </field>
<group col="4" colspan="1"> <group>
<field name="state_attendance"/> <div align="right">
<button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/> <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
<button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/> <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
<field name="total_attendance_day" widget="float_time" colspan="4"/> </div>
</group>
</group>
<group col="4">
<field name="state_attendance"/>
</group> </group>
<field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1"> <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
<tree editable="top" string="Timesheet Lines"> <tree editable="top" string="Timesheet Lines">
@ -124,8 +135,6 @@
<field name="user_id" required="1"/> <field name="user_id" required="1"/>
</form> </form>
</field> </field>
<field name="total_difference_day" widget="float_time"/>
<field name="total_timesheet_day" widget="float_time"/>
</page> </page>
<page string="Summary"> <page string="Summary">
<field colspan="4" name="period_ids" nolabel="1"> <field colspan="4" name="period_ids" nolabel="1">
@ -136,11 +145,6 @@
<field name="total_difference" widget="float_time"/> <field name="total_difference" widget="float_time"/>
</tree> </tree>
</field> </field>
<group colspan="4" col="6">
<field name="total_attendance" widget="float_time"/>
<field name="total_timesheet" widget="float_time"/>
<field name="total_difference" widget="float_time"/>
</group>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -227,7 +231,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="user_id" position="before"> <field name="date" position="before">
<field name="sheet_id"/> <field name="sheet_id"/>
</field> </field>
</field> </field>
@ -350,5 +354,16 @@
context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}" context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/> id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
<record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.employee.extd_form</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='button_box']" position="inside">
<button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
</xpath>
</field>
</record>
</data> </data>
</openerp> </openerp>

12
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
View File

@ -9,23 +9,17 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/> <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="//page[@name='information']/group/group[@name='right_column']" position="before"> <xpath expr="//field[@name='struct_id']" position="after">
<field name="travel_reimbursement_amount"/> <field name="travel_reimbursement_amount"/>
<field name="car_company_amount"/> <field name="car_company_amount"/>
<field name="car_employee_deduction"/>
<field name="misc_onss_deduction"/> <field name="misc_onss_deduction"/>
<field name="meal_voucher_amount"/> <field name="meal_voucher_amount"/>
<field name="meal_voucher_employee_deduction"/>
<field name="misc_advantage_amount"/> <field name="misc_advantage_amount"/>
<separator string="Miscellaneous" colspan="2"/>
<field name="additional_net_amount"/> <field name="additional_net_amount"/>
<field name="retained_net_amount"/> <field name="retained_net_amount"/>
</xpath>
<xpath expr="//field[@name='trial_date_end']" position="after">
<group colspan="2" col="2">
<separator string="by Worker" colspan="2"/>
<field name="insurance_employee_deduction"/> <field name="insurance_employee_deduction"/>
<field name="meal_voucher_employee_deduction"/>
<field name="car_employee_deduction"/>
</group>
</xpath> </xpath>
</data> </data>
</field> </field>

12
addons/mail/static/src/js/mail.js
View File

@ -91,7 +91,7 @@ openerp.mail = function(session) {
this.params = params; this.params = params;
this.params.parent_id = this.params.parent_id || false; this.params.parent_id = this.params.parent_id || false;
this.params.thread_level = this.params.thread_level || 0; this.params.thread_level = this.params.thread_level || 0;
this.params.msg_more_limit = this.params.msg_more_limit || 100; this.params.msg_more_limit = this.params.msg_more_limit || 290;
this.params.limit = this.params.limit || 100; this.params.limit = this.params.limit || 100;
this.params.offset = this.params.offset || 0; this.params.offset = this.params.offset || 0;
this.params.records = this.params.records || null; this.params.records = this.params.records || null;
@ -304,7 +304,6 @@ openerp.mail = function(session) {
// format date according to the user timezone // format date according to the user timezone
record.date = session.web.format_value(record.date, {type:"datetime"}); record.date = session.web.format_value(record.date, {type:"datetime"});
var rendered = session.web.qweb.render('mail.Thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display}); var rendered = session.web.qweb.render('mail.Thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
$(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first')); $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
// expand feature // expand feature
@ -635,6 +634,7 @@ openerp.mail = function(session) {
start: function () { start: function () {
this._super.apply(this, arguments); this._super.apply(this, arguments);
var self = this; var self = this;
this.display_current_user();
// add events // add events
this.add_event_handlers(); this.add_event_handlers();
// load mail.message search view // load mail.message search view
@ -694,6 +694,14 @@ openerp.mail = function(session) {
}); });
}, },
display_current_user: function () {
return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.session.uid));
},
thread_get_avatar: function(model, field, id) {
return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
},
/** /**
* Initializes the wall and calls fetch_comments * Initializes the wall and calls fetch_comments
* @param {Number} limit: number of notifications to fetch * @param {Number} limit: number of notifications to fetch

2
addons/mail/static/src/xml/mail.xml
View File

@ -56,10 +56,8 @@
<div t-name="mail.Thread" class="oe_mail oe_mail_thread"> <div t-name="mail.Thread" class="oe_mail oe_mail_thread">
<div class="oe_mail_thread_action"> <div class="oe_mail_thread_action">
<img class="oe_mail_msg_image oe_left" alt="User img"/> <img class="oe_mail_msg_image oe_left" alt="User img"/>
<div class="oe_mail_msg_content">
<textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/> <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
</div> </div>
</div>
<div class="oe_mail_thread_display"></div> <div class="oe_mail_thread_display"></div>
<div class="oe_mail_thread_more"> <div class="oe_mail_thread_more">
<button class="oe_mail_button_more" type="button">Load more messages</button> <button class="oe_mail_button_more" type="button">Load more messages</button>

2
addons/marketing_campaign/marketing_campaign.py
View File

@ -439,7 +439,7 @@ class marketing_campaign_activity(osv.osv):
'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')), 'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
'signal': fields.char('Signal', size=128, 'signal': fields.char('Signal', size=128,
help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'), help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
'keep_if_condition_not_met': fields.boolean("Don't delete workitems", 'keep_if_condition_not_met': fields.boolean("Don't Delete Workitems",
help="By activating this option, workitems that aren't executed because the condition is not met are marked as cancelled instead of being deleted.") help="By activating this option, workitems that aren't executed because the condition is not met are marked as cancelled instead of being deleted.")
} }

73
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -9,6 +9,22 @@
Marketing Campaign Marketing Campaign
====================== ======================
--> -->
<act_window name="All Segments"
res_model="marketing.campaign.segment"
src_model="marketing.campaign"
view_type="form"
view_mode="tree,form"
id="act_marketing_campaing_segment_opened"
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
/>
<!-- Campaign Followups -->
<act_window
context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
id="act_marketing_campaing_followup"
name="Campaign Follow-up" res_model="marketing.campaign.workitem"
src_model="marketing.campaign" view_mode="tree,form"
view_type="form" />
<record model="ir.ui.view" id="view_marketing_campaign_form"> <record model="ir.ui.view" id="view_marketing_campaign_form">
<field name="name">marketing.campaign.form</field> <field name="name">marketing.campaign.form</field>
@ -24,20 +40,30 @@
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/> <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header> </header>
<sheet string="Campaign"> <sheet string="Campaign">
<div class="oe_right oe_button_box" name="button_box">
<button type="action"
name="%(act_marketing_campaing_followup)d"
string="Follow-Up" />
<button type="action"
name="%(act_marketing_campaing_segment_opened)d"
string="Segments" />
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name" class="oe_inline"/></h1>
</div>
<group>
<group> <group>
<group string="Campaign">
<field name="name"/>
<field name="mode"/> <field name="mode"/>
<field name="fixed_cost"/>
</group> </group>
<group string="Resource"> <group>
<field name="object_id"/> <field name="object_id"/>
<field name="partner_field_id"/> <field name="partner_field_id"/>
<field name="unique_field_id"/> <field name="unique_field_id"/>
</group> </group>
<group string="Cost">
<field name="fixed_cost"/>
</group>
</group> </group>
<separator string="Activities"/>
<field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" /> <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
</sheet> </sheet>
</form> </form>
@ -143,15 +169,10 @@
</header> </header>
<sheet string="Segments" > <sheet string="Segments" >
<group> <group>
<group string="Segment"> <group>
<field name="name"/> <field name="name"/>
<field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/> <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
<field name="object_id" invisible="1"/> <field name="object_id" invisible="1"/>
</group>
<group string="Filter">
<field name="ir_filter_id"/>
</group>
<group string="Synchronization">
<field name="sync_mode" required="True"/> <field name="sync_mode" required="True"/>
<label for="sync_last_date"/> <label for="sync_last_date"/>
<div> <div>
@ -160,7 +181,8 @@
</div> </div>
<field name="date_next_sync"/> <field name="date_next_sync"/>
</group> </group>
<group string="History"> <group>
<field name="ir_filter_id"/>
<field name="date_run" readonly="1"/> <field name="date_run" readonly="1"/>
<field name="date_done" readonly="1"/> <field name="date_done" readonly="1"/>
</group> </group>
@ -243,24 +265,24 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Activities" version="7.0"> <form string="Activities" version="7.0">
<group> <group>
<group string="Activity"> <group>
<field name="name"/> <field name="name"/>
<field name="signal" groups="base.group_no_one"/> <field name="signal" groups="base.group_no_one"/>
<field name="start"/> <field name="start"/>
<field name="object_id" invisible="1"/> <field name="object_id" invisible="1"/>
<field name="campaign_id" invisible="1"/> <field name="campaign_id" invisible="1"/>
</group> </group>
<group string="Cost / Revenue"> <group>
<field name="variable_cost"/> <field name="variable_cost"/>
<field name="revenue"/> <field name="revenue"/>
</group> </group>
</group> </group>
<group string="Condition" col="4"> <group >
<field name="condition" widget="char" colspan="4"/> <group>
<field name="condition" widget="char"/>
<field name="keep_if_condition_not_met"/> <field name="keep_if_condition_not_met"/>
</group> </group>
<group col="4"> <group>
<separator string="Action" colspan="4"/>
<field name="type"/> <field name="type"/>
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}" <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
context="{'default_model_id':object_id}" /> context="{'default_model_id':object_id}" />
@ -268,8 +290,9 @@
<field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/> <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
<field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/> <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
</group> </group>
<separator string="Transitions"/> </group>
<field name="from_ids" mode="tree,form" context="{'default_activity_to_id': active_id}"> <separator string="Previous Activities"/>
<field name="from_ids" mode="tree" context="{'default_activity_to_id': active_id}">
<tree string="Incoming Transitions" editable="bottom"> <tree string="Incoming Transitions" editable="bottom">
<field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/> <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name='trigger'/> <field name='trigger'/>
@ -285,7 +308,8 @@
</group> </group>
</form> </form>
</field> </field>
<field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2"> <separator string="Next Activities"/>
<field name="to_ids" mode="tree" context="{'default_activity_from_id': active_id}">
<tree string="Outgoing Transitions" editable="bottom"> <tree string="Outgoing Transitions" editable="bottom">
<field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/> <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name='trigger'/> <field name='trigger'/>
@ -363,12 +387,13 @@
</header> </header>
<sheet> <sheet>
<group> <group>
<group string="Campaign Step"> <group>
<field name="campaign_id"/> <field name="campaign_id"/>
<field name="segment_id"/> <field name="segment_id"/>
<field name="activity_id" context="{'segment_id':segment_id}"/> <field name="activity_id" context="{'segment_id':segment_id}"/>
<field name="date"/> <field name="date"/>
</group><group string="Related Resource"> </group>
<group>
<field name="object_id" readonly="True"/> <field name="object_id" readonly="True"/>
<field name="res_name"/> <field name="res_name"/>
<field name="res_id"/> <field name="res_id"/>

3
addons/mrp/mrp_view.xml
View File

@ -957,8 +957,7 @@
</xpath> </xpath>
<xpath expr="//field[@name='close_move']" position="after"> <xpath expr="//field[@name='close_move']" position="after">
<group colspan="4" groups="product.group_mrp_properties"> <group colspan="4" groups="product.group_mrp_properties">
<separator colspan="4" string="Properties" /> <field colspan="4" name="property_ids" widget="many2many_tags"/>
<field colspan="4" name="property_ids" nolabel="1"/>
</group> </group>
</xpath> </xpath>
</data> </data>

2
addons/portal_hr_employees/__openerp__.py
View File

@ -32,7 +32,7 @@ portal_crm (which creates the contact page) are installed.
'author': 'OpenERP SA', 'author': 'OpenERP SA',
'depends': ['hr','portal_crm'], 'depends': ['hr','portal_crm'],
'data': [ 'data': [
'hr_employee_view.xml', 'portal_hr_employee_view.xml',
'security/portal_crm_security.xml', 'security/portal_crm_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
], ],

68
addons/portal_hr_employees/hr_employee_view.xml
View File

@ -1,68 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- add visibility field to the employee form view -->
<record id="view_employee_form" model="ir.ui.view">
<field name="name">portal_hr_employees.employee.form</field>
<field name="model">hr.employee</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='job_information']" position="after">
<group string="Employee's visibility">
<field name="visibility"/>
</group>
</xpath>
</field>
</record>
<!-- a kanban view of the employees to the portal's contact page -->
<record id="wizard_contact_form_view_employees_list" model="ir.ui.view">
<field name="name">portal_hr_employees.employees_list</field>
<field name="model">portal_crm.crm_contact_us</field>
<field name="type">form</field>
<field name="inherit_id" ref="portal_crm.wizard_contact_form_view"/>
<field name="arch" type="xml">
<xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
<h1>Meet the team</h1>
<field name="employee_ids" widget="many2many_kanban">
<kanban>
<field name="visibility"/>
<templates>
<t t-name="kanban-box">
<div class="oe_employee_vignette">
<span class="oe_dropdown_toggle oe_dropdown_arrow">
<ul class="oe_dropdown_menu">
<li t-if="record.visibility.raw_value != 'private'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_private">Hide this employee</a></li>
<li t-if="record.visibility.raw_value != 'public'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_public">Make this employee visible for everyone</a></li>
<li t-if="record.visibility.raw_value != 'portal'"><a href="#" t-attf-data-id='{record.id}' class="oe_employee_make_portal">Make this employee visible for portal users</a></li>
</ul>
</span>
<div class="oe_employee_image">
<img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
</div>
<div class="oe_employee_details">
<h4>
<field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t>
</h4>
<ul>
<li t-if="record.job_id.raw_value"><field name="job_id"/></li>
<li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
<li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
<li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
</ul>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</xpath>
</field>
</record>
</data>
</openerp>

18
addons/project/i18n/hr.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n" "Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2010-08-03 09:16+0000\n" "PO-Revision-Date: 2012-07-05 11:02+0000\n"
"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n" "Last-Translator: Marko Carevic <Unknown>\n"
"Language-Team: Vinteh\n" "Language-Team: Vinteh\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15505)\n" "X-Generator: Launchpad (build 15558)\n"
"Language: hr\n" "Language: hr\n"
#. module: project #. module: project
@ -108,7 +108,7 @@ msgstr "Sati za procjenu"
#. module: project #. module: project
#: view:project.project:0 #: view:project.project:0
msgid "Pending Projects" msgid "Pending Projects"
msgstr "" msgstr "Projekti na čekanju"
#. module: project #. module: project
#: help:project.task,remaining_hours:0 #: help:project.task,remaining_hours:0
@ -191,7 +191,7 @@ msgstr "Tvrtka"
#. module: project #. module: project
#: view:report.project.task.user:0 #: view:report.project.task.user:0
msgid "Pending tasks" msgid "Pending tasks"
msgstr "" msgstr "Zadaci na čekanju"
#. module: project #. module: project
#: field:project.task.delegate,prefix:0 #: field:project.task.delegate,prefix:0
@ -206,7 +206,7 @@ msgstr ""
#. module: project #. module: project
#: model:process.transition.action,name:project.process_transition_action_openpendingtask0 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
msgid "Set pending" msgid "Set pending"
msgstr "Postavite u tijeku" msgstr "Staviti na čekanje"
#. module: project #. module: project
#: selection:project.task,priority:0 #: selection:project.task,priority:0
@ -641,7 +641,7 @@ msgstr "Srednji"
#. module: project #. module: project
#: view:project.task:0 view:project.task.history.cumulative:0 #: view:project.task:0 view:project.task.history.cumulative:0
msgid "Pending Tasks" msgid "Pending Tasks"
msgstr "" msgstr "Zadaci na čekanju"
#. module: project #. module: project
#: view:project.task:0 field:project.task,remaining_hours:0 #: view:project.task:0 field:project.task,remaining_hours:0
@ -705,7 +705,7 @@ msgstr ""
#: selection:project.vs.hours,state:0 view:report.project.task.user:0 #: selection:project.vs.hours,state:0 view:report.project.task.user:0
#: selection:report.project.task.user,state:0 selection:task.by.days,state:0 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
msgid "Pending" msgid "Pending"
msgstr "U toku" msgstr "Na čekanju"
#. module: project #. module: project
#: field:project.task.delegate,name:0 #: field:project.task.delegate,name:0

2
addons/project/project_view.xml
View File

@ -239,7 +239,7 @@
<t t-name="kanban-box"> <t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
<div class="oe_dropdown_toggle oe_dropdown_kanban"> <div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span> <span class="oe_e">í</span>
<ul class="oe_dropdown_menu"> <ul class="oe_dropdown_menu">
<li><a type="edit">Edit...</a></li> <li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li> <li><a type="delete">Delete</a></li>

3
addons/sale/sale_view.xml
View File

@ -235,9 +235,8 @@
<field name="delay"/> <field name="delay"/>
<field name="th_weight"/> <field name="th_weight"/>
<field name="address_allotment_id"/> <field name="address_allotment_id"/>
<field name="property_ids" widget="many2many_tags"/>
</group> </group>
<separator string="Properties" colspan="2"/>
<field name="property_ids" colspan="4" nolabel="1"/>
<field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/> <field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/>
<div groups="base.group_no_one"> <div groups="base.group_no_one">
<separator colspan="4" string="Invoice Lines"/> <separator colspan="4" string="Invoice Lines"/>

4
addons/stock_planning/i18n/ja.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-05 04:49+0000\n" "X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n"
"X-Generator: Launchpad (build 15544)\n" "X-Generator: Launchpad (build 15558)\n"
#. module: stock_planning #. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73 #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73

358
addons/survey/i18n/ja.po
View File

File diff suppressed because it is too large Load Diff

15
addons/web_livechat/LICENSE
View File

@ -1,15 +0,0 @@
OpenERP, Open Source Management Solution
Copyright © 2010-2011 OpenERP SA (<http://openerp.com>).
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public Lice
along with this program. If not, see <http://www.gnu.org/licenses/>.

22
addons/web_livechat/__init__.py
View File

@ -1,22 +0,0 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import publisher_warranty
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

50
addons/web_livechat/__openerp__.py
View File

@ -1,50 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Live Chat Support',
'version': '2.0',
'category': 'Tools',
'description': """
Enable live chat support for those who have a maintenance contract.
===================================================================
Add "Support" button in header from where you can access OpenERP Support.
""",
'author': 'OpenERP SA',
'website': 'http://openerp.com',
'depends': ['base'],
'update_xml': [],
'js' : [
'static/src/js/web_livechat.js',
],
'css' : [
'static/src/css/lc.css',
],
'qweb' : [
"static/src/xml/*.xml",
],
'installable': True,
'auto_install': False,
'certificate': '0013762192410413',
'images': ['static/src/img/web_livechat_support.jpeg'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

34
addons/web_livechat/i18n/ar.po
View File

@ -1,34 +0,0 @@
# Arabic translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-01-07 23:53+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Arabic <ar@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "ذلك العقد قد تمّ تسجيله في النظام سابقاً."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "التحدث مع الدعم الفني"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "تمكين الدعم الفني المباشر للحاصلين علي عقد دعم فني"

34
addons/web_livechat/i18n/bg.po
View File

@ -1,34 +0,0 @@
# Bulgarian translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-03-01 14:52+0000\n"
"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
"Language-Team: Bulgarian <bg@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr ""
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Поддръжка чат на живо"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Разрешете live chat поддръжка ако имате договор за поддръжка"

35
addons/web_livechat/i18n/ca.po
View File

@ -1,35 +0,0 @@
# Catalan translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-03-05 23:39+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Catalan <ca@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Aquest contracte ja està registrat al sistema."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "editor_garantia.contracte"
#~ msgid "Live Chat Support"
#~ msgstr "Xat d'assistència"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Permet suport per xat per a aquells que ja tenen contracte de manteniment"

28
addons/web_livechat/i18n/cs.po
View File

@ -1,28 +0,0 @@
# Czech translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-04-06 04:48+0000\n"
"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
"Language-Team: Czech <cs@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: 2012-04-07 04:55+0000\n"
"X-Generator: Launchpad (build 15060)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Tato smlouva je již v systému registrována."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"

28
addons/web_livechat/i18n/da.po
View File

@ -1,28 +0,0 @@
# Danish translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-01-27 06:45+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Danish <da@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr ""
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr ""

34
addons/web_livechat/i18n/de.po
View File

@ -1,34 +0,0 @@
# German translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-21 20:28+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"Language-Team: German <de@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Der Wartungsvertrag wurde bereits im System registriert."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Live Chat Unterstützung"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Live Chat für Vetragsinhaber aktivieren"

36
addons/web_livechat/i18n/es.po
View File

@ -1,36 +0,0 @@
# Spanish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-15 15:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish <es@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Ese contrato ya está registrado en el sistema."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "editor_garantía.contrato"
#~ msgid "Live Chat Support"
#~ msgstr "Chat de asistencia"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Permite soporte por chat para aquellos que ya tienen contrato de "
#~ "mantenimiento"

38
addons/web_livechat/i18n/es_CR.po
View File

@ -1,38 +0,0 @@
# Spanish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-02-18 23:24+0000\n"
"Last-Translator: Carlos Vásquez (CLEARCORP) "
"<carlos.vasquez@clearcorp.co.cr>\n"
"Language-Team: Spanish <es@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: 2012-02-19 05:43+0000\n"
"X-Generator: Launchpad (build 14814)\n"
"Language: es\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Ese contrato ya está registrado en el sistema."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "editor_garantía.contrato"
#~ msgid "Live Chat Support"
#~ msgstr "Chat de asistencia"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Permite soporte por chat para aquellos que ya tienen contrato de "
#~ "mantenimiento"

41
addons/web_livechat/i18n/es_MX.po
View File

@ -1,41 +0,0 @@
# Spanish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
"PO-Revision-Date: 2011-02-15 15:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish <es@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: 2011-09-05 05:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid ""
"Your publisher warranty contract is already subscribed in the system !"
msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
#. module: web_livechat
#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
msgid "Live Chat Support"
msgstr "Chat de asistencia"
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "editor_garantía.contrato"
#. module: web_livechat
#: model:ir.module.module,description:web_livechat.module_meta_information
msgid "Enable live chat support for whom have a maintenance contract"
msgstr ""
"Permite soporte por chat para aquellos que ya tienen contrato de "
"mantenimiento"

41
addons/web_livechat/i18n/es_VE.po
View File

@ -1,41 +0,0 @@
# Spanish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
"PO-Revision-Date: 2011-02-15 15:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish <es@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: 2011-09-05 05:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid ""
"Your publisher warranty contract is already subscribed in the system !"
msgstr "¡Su contrato de garantía del editor ya está inscrito en el sistema!"
#. module: web_livechat
#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
msgid "Live Chat Support"
msgstr "Chat de asistencia"
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "editor_garantía.contrato"
#. module: web_livechat
#: model:ir.module.module,description:web_livechat.module_meta_information
msgid "Enable live chat support for whom have a maintenance contract"
msgstr ""
"Permite soporte por chat para aquellos que ya tienen contrato de "
"mantenimiento"

34
addons/web_livechat/i18n/fi.po
View File

@ -1,34 +0,0 @@
# Finnish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-06-08 10:30+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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Sopimus on jo rekisteröity järjestelmään."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr ""
#~ msgid "Live Chat Support"
#~ msgstr "Chatin tuki"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Aloita chatti tuki ylläpitosopimuksen toimittajan kanssa"

36
addons/web_livechat/i18n/fr.po
View File

@ -1,36 +0,0 @@
# French translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-26 09:39+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: French <fr@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Ce contrat est déjà enregistré dans le système."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Support par messagerie instantanée"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Valider le support par messagerie instantanée pour les détenteurs d'un "
#~ "contrat de maintenance"

35
addons/web_livechat/i18n/gl.po
View File

@ -1,35 +0,0 @@
# Galician translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-03-05 01:41+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Galician <gl@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "O contrato xa está rexistrado no sistema."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "editor_garantía.contrato"
#~ msgid "Live Chat Support"
#~ msgstr "Chat de asistencia"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Permitir soporte por chat para aqueles que xa teñan contrato de mantemento"

34
addons/web_livechat/i18n/hr.po
View File

@ -1,34 +0,0 @@
# Croatian translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-01-28 21:59+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
"Language-Team: Croatian <hr@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Navedeni ugovor je već registriran u sustavu."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Omogući podršku za Live Chat za one koji imaju ugovor o održavanju"
#~ msgid "Live Chat Support"
#~ msgstr "Podrška za Live Chat"

35
addons/web_livechat/i18n/it.po
View File

@ -1,35 +0,0 @@
# Italian translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-15 15:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Italian <it@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr ""
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Supporto live chat"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Abilita il supporto live chat per chi ha un contratto di manutenzione"

28
addons/web_livechat/i18n/ja.po
View File

@ -1,28 +0,0 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-16 21:21+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\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: 2012-06-17 04:35+0000\n"
"X-Generator: Launchpad (build 15419)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "この契約は既にシステムに登録されています。"
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr ""

35
addons/web_livechat/i18n/nl.po
View File

@ -1,35 +0,0 @@
# Dutch translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-21 10:22+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
"Language-Team: Dutch <nl@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Dat contract is al geregisteerd in het systeem."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Live Chat Support"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Live chat support aanzetten voor diegenen die een onderhoudscontract hebben"

36
addons/web_livechat/i18n/oc.po
View File

@ -1,36 +0,0 @@
# Occitan (post 1500) translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-11-20 09:29+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Occitan (post 1500) <oc@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Aqueste contracte es ja enregistrat dins lo sistèma."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Supòrt per messatjariá instantanèa"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Validar lo supòrt per messatjariá instantanèa pels detentors d'un contracte "
#~ "de mantenença"

36
addons/web_livechat/i18n/pt.po
View File

@ -1,36 +0,0 @@
# Portuguese translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-07-31 22:18+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Portuguese <pt@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "O contrato já está registado no sistema."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "Copy text \t publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Suporte por mensagens instantâneas (chat)"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Ativar suporte através de mensagens instantâneas para quem tenha contrato de "
#~ "suporte"

35
addons/web_livechat/i18n/pt_BR.po
View File

@ -1,35 +0,0 @@
# Brazilian Portuguese translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-01-18 02:51+0000\n"
"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Esse contato já está registrado no sistema."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Ativa o suporte com conversa ao vivo para quem tem um contrato de manutenção"
#~ msgid "Live Chat Support"
#~ msgstr "Suporte com Conversa ao Vivo"

36
addons/web_livechat/i18n/ro.po
View File

@ -1,36 +0,0 @@
# Romanian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-01-08 19:46+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Romanian <ro@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Acel contract este deja inregistrat in sistem."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract (contract. garantie_editor)"
#~ msgid "Live Chat Support"
#~ msgstr "Asistentă tehnică pentru Discutiile online"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Activează asistenta tehnică pentru discutiile online pentru cei care au un "
#~ "contract de mentenantă."

36
addons/web_livechat/i18n/ru.po
View File

@ -1,36 +0,0 @@
# Russian translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-03-09 17:08+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Russian <ru@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Договор уже зарегистрирован в системе."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Техподдержка в режиме живого общения"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr ""
#~ "Включить поддержку живого общения для тех, у кого есть договор на "
#~ "обслуживание"

34
addons/web_livechat/i18n/sk.po
View File

@ -1,34 +0,0 @@
# Slovak translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-21 13:46+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovak <sk@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr ""
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Live Chat Podpora"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Povoliť live chat podporu pre toho kto má servisnú zmluvu"

34
addons/web_livechat/i18n/sl.po
View File

@ -1,34 +0,0 @@
# Slovenian translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-05-22 17:08+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovenian <sl@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Ta pogodba je v sistemu že vnešena"
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Pomoč v živo"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Omogoči pomoč v živo za uporabnike z vzdrževalno pogodbo"

34
addons/web_livechat/i18n/sr@latin.po
View File

@ -1,34 +0,0 @@
# Serbian Latin translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-10-17 13:43+0000\n"
"Last-Translator: Milan Milosevic <Unknown>\n"
"Language-Team: Serbian Latin <sr@latin@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr ""
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Omogući podršku ćaskanja uživo za one koji imaju ugovor o održavanju"
#~ msgid "Live Chat Support"
#~ msgstr "Podrška ćaskanja uživo"

28
addons/web_livechat/i18n/sv.po
View File

@ -1,28 +0,0 @@
# Swedish translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-04 15:38+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Swedish <sv@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: 2012-06-05 04:54+0000\n"
"X-Generator: Launchpad (build 15353)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Det kontraktet har redan registrerats i systemet."
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"

34
addons/web_livechat/i18n/tr.po
View File

@ -1,34 +0,0 @@
# Turkish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-04-26 14:31+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Turkish <tr@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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "Bu sözleşme sistemde zaten kayıtlı !"
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "Canlı Sohbet Desteği"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "Bakım sözleşmesi olanlar için canlı sohbet desteğini açar"

46
addons/web_livechat/i18n/web_livechat.pot
View File

@ -1,46 +0,0 @@
# #-#-#-#-# web_livechat.pot (OpenERP Server 6.1rc1) #-#-#-#-#
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * web_livechat
#
# #-#-#-#-# web_livechat.pot.web (PROJECT VERSION) #-#-#-#-#
# Translations template for PROJECT.
# Copyright (C) 2012 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
#, fuzzy
msgid ""
msgstr ""
"#-#-#-#-# web_livechat.pot (OpenERP Server 6.1rc1) #-#-#-#-#\n"
"Project-Id-Version: OpenERP Server 6.1rc1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-02-08 00:37+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"
"#-#-#-#-# web_livechat.pot.web (PROJECT VERSION) #-#-#-#-#\n"
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.6\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr ""
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr ""

34
addons/web_livechat/i18n/zh_CN.po
View File

@ -1,34 +0,0 @@
# Chinese (Simplified) translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-04-08 07:20+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-02-09 07:09+0000\n"
"X-Generator: Launchpad (build 14763)\n"
#. module: web_livechat
#: sql_constraint:publisher_warranty.contract:0
msgid "That contract is already registered in the system."
msgstr "该合同已登记到系统中。"
#. module: web_livechat
#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#~ msgid "Live Chat Support"
#~ msgstr "支持在线交流"
#~ msgid "Enable live chat support for whom have a maintenance contract"
#~ msgstr "其中一个维护合同支持在线交流"

48
addons/web_livechat/publisher_warranty.py
View File

@ -1,48 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import osv
from tools import cache
def _gen_cache_clear(method):
def func(self, cr, *args, **kwargs):
s = super(publisher_warranty_contract, self)
r = getattr(s, method)(cr, *args, **kwargs)
self.is_livechat_enable.clear_cache(self)
return r
return func
class publisher_warranty_contract(osv.osv):
_inherit = 'publisher_warranty.contract'
create = _gen_cache_clear('create')
write = _gen_cache_clear('write')
unlink = _gen_cache_clear('unlink')
@cache(skiparg=3, timeout=300)
def is_livechat_enable(self, cr, uid):
domain = [('state', '=', 'valid'), ('check_support', '=', True)]
return self.search_count(cr, uid, domain) != 0
publisher_warranty_contract()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

7
addons/web_livechat/static/src/css/lc.css
View File

@ -1,7 +0,0 @@
.livechat span.online {
text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
}
.livechat img {
vertical-align: middle;
margin-right: 0.5em;
}

BIN
addons/web_livechat/static/src/img/available.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
addons/web_livechat/static/src/img/away.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
addons/web_livechat/static/src/img/busy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

127
addons/web_livechat/static/src/js/web_livechat.js
View File

@ -1,127 +0,0 @@
/*############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2011-2012 OpenERP SA (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
############################################################################*/
var __lc_buttons = [];
openerp.web_livechat = function (openerp) {
openerp.web_livechat.Livechat = openerp.web.Widget.extend({
template: 'Systray.LiveChat',
start: function() {
this._super();
if (!this.session)
return;
var self = this;
var pwc = new openerp.web.Model("publisher_warranty.contract");
pwc.get_func('is_livechat_enable')().then(function(res) {
if(res) {
self.$element.click(self.do_load_livechat);
} else {
self.$element.click(self.do_open_url);
}
});
},
do_open_url: function(evt) {
evt.preventDefault();
openerp.webclient.action_manager.do_action({type: 'ir.actions.act.url', url: 'http://www.openerp.com/support-or-publisher-warranty-contract', target: 'new'});
},
do_load_livechat: function(evt) {
var self = this;
if (evt) {
evt.preventDefault();
}
this.$element.unbind('click', this.do_load_livechat);
var lc_id = _.uniqueId('livechat_');
this.$element.attr('id', lc_id);
var pwc = new openerp.web.Model("publisher_warranty.contract");
pwc.get_func('is_livechat_enable')().then(function(res) {
if(!res) {
return;
}
// connect to LiveChat
__lc_load();
__lc_buttons.push({
elementId: lc_id, //'livechat_status',
language: 'en',
skill: '2',
type: 'text',
labels: {
online: '<img src="/web_livechat/static/src/img/available.png"/>',
offline: '<img src="/web_livechat/static/src/img/away.png"/>',
}
});
});
}
});
openerp.web.UserMenu.include({
do_update: function() {
var self = this;
this._super.apply(this, arguments);
this.update_promise.then(function() {
if (self.livechat) {
self.livechat.destroy();
}
self.livechat = new openerp.web_livechat.Livechat(self);
self.livechat.appendTo(openerp.webclient.$element.find('.oe_systray'));
});
}
});
if (openerp.webclient) {
// tracking code from LiveChat
var license = '1035052',
params = '',
lang = 'en',
skill = '0';
__lc_load = function (p) {
if (typeof __lc_loaded != 'function')
if (p) {
var d = document,
l = d.createElement('script'),
s = d.getElementsByTagName('script')[0],
a = unescape('%26'),
h = ('https:' == d.location.protocol ? 'https://' : 'http://');
l.type = 'text/javascript';
l.async = true;
l.src = h + 'gis' + p +'.livechatinc.com/gis.cgi?serverType=control'+a+'licenseID='+license+a+'jsonp=__lc_load';
if (!(typeof p['server'] !== 'string' || typeof __lc_serv === 'string')) {
l.src = h + (__lc_serv = p['server']) + '/licence/'+license+'/script.cgi?lang='+lang+a+'groups='+skill;
l.src += (params == '') ? '' : a+'params='+encodeURIComponent(encodeURIComponent(params));
s.parentNode.insertBefore(l, s);
} else
setTimeout(__lc_load, 1000);
if(typeof __lc_serv != 'string'){
s.parentNode.insertBefore(l, s);
}
} else __lc_load(Math.ceil(Math.random()*5));
}
}
};

10
addons/web_livechat/static/src/xml/web_livechat.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- vim:fdl=1:
-->
<templates id="template" xml:space="preserve">
<t t-name="Systray.LiveChat">
<div class="oe_systray_livechat" title="Support">
<a href="#"><img src="/web_livechat/static/src/img/busy.png"/></a>
</div>
</t>
</templates>

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

@ -1,6 +1,6 @@
/* Shortcuts*/ /* Shortcuts*/
.oe_systray_shortcuts { .oe_systray_shortcuts .oe_star_off {
margin: 3px; color: #eee;
} }
.oe_shortcuts_toggle { .oe_shortcuts_toggle {
height: 20px; height: 20px;

4
addons/web_shortcuts/static/src/xml/web_shortcuts.xml
View File

@ -3,8 +3,8 @@
--> -->
<templates id="template" xml:space="preserve"> <templates id="template" xml:space="preserve">
<t t-name="Systray.Shortcuts"> <t t-name="Systray.Shortcuts">
<div class="oe_systray_shortcuts oe_dropdown_toggle"> <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
<a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a> <span class="oe_e oe_star_off">7</span>
<ul class="oe_systray_shortcuts_items oe_dropdown_menu"/> <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
</div> </div>
</t> </t>