pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge] Merge with main addons.

Browse Source 
bzr revid: mdi@tinyerp.com-20120706042513-zbkor9dcuavemq08
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-07-06 09:55:13 +05:30
parent d70ca96b85 a3a9594ae5
commit 4f6872fe6c
72 changed files with 2386 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/analytic_contract_expense_project/__openerp__.py
+1 -1
View File
@@ -23,7 +23,7 @@
{
'name': 'Projects Management: hr_expense link',
'version': '1.1',
'category': 'Sales Management',
'category': 'Hidden',
'description': """
This module is for modifying project view to show some data related to the hr_expense module.
======================================================================================================
addons/analytic_contract_hr_expense/__openerp__.py
+1 -1
View File
@@ -23,7 +23,7 @@
{
'name': 'Contracts Management: hr_expense link',
'version': '1.1',
'category': 'Sales Management',
'category': 'Hidden',
'description': """
This module is for modifying account analytic view to show some data related to the hr_expense module.
======================================================================================================
addons/analytic_contract_project/__openerp__.py
+1
View File
@@ -23,6 +23,7 @@
"name" : "Contract On Project",
"version": "1.1",
"author" : "OpenERP SA",
'category': 'Hidden',
"website" : "http://www.openerp.com",
"depends" : ["project", "account_analytic_analysis"],
"description": """
addons/crm/crm_lead_view.xml
+8 -12
View File
@@ -290,7 +290,7 @@
<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 class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu">
<li><a type="edit" >Edit...</a></li>
<li><a type="delete">Delete</a></li>
@@ -312,18 +312,14 @@
<field name="partner_id"/>
</div>
<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>
<span t-attf-class="#{red || ''}">
<field name="date_action"/>
</span>
<t t-if="record.date_action.raw_value"> : </t>
<field name="title_action"/>
</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>
<span t-attf-class="#{red || ''}"><field name="date_action"/></span>
<t t-if="record.date_action.raw_value"> : </t>
<field name="title_action"/>
</div>
<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" 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_normal_priority" class="oe_e oe_star_on">7</a>
<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>
<span t-attf-class="oe_kanban_status #{red}"> </span>
@@ -472,7 +468,7 @@
<label for="planned_revenue" class="oe_edit_only"/>
<h2>
<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
</h2>
</div>
addons/delivery/delivery_view.xml
+5 -3
View File
@@ -257,13 +257,15 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='sale_total']" position="after">
<group>
<group width="50%%">
<label for="carrier_id"/>
<div>
<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>
<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>
</xpath>
</field>
addons/hr/hr_department_view.xml
+8 -6
View File
@@ -13,12 +13,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="department" version="7.0">
<group col="4">
<field name="name"/>
<field name="parent_id"/>
<field name="manager_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<sheet>
<group col="4">
<field name="name"/>
<field name="manager_id"/>
<field name="parent_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</sheet>
</form>
</field>
</record>
addons/hr/hr_view.xml
+71 -61
View File
@@ -20,60 +20,64 @@
<field name="arch" type="xml">
<form string="Employee" version="7.0">
<sheet>
<div class="oe_right oe_button_box">
<!-- Put here related buttons -->
</div>
<field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
<h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
<label for="department_id" class="oe_edit_only"/>
<h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
</div>
<notebook>
<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"/>
<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 -->
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
<label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
<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"/>
<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>
<group colspan="4" col="4">
<field name="work_email" widget="email" />
<field name="work_phone"/>
<field name="address_id" on_change="onchange_address_id(address_id)" />
<field name="mobile_phone"/>
</group>
<notebook>
<page string="Information">
<group>
<group>
<field name="user_id" on_change="onchange_user(user_id)"/>
<field name="parent_id" />
<field name="coach_id"/>
</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 name="active_group">
<field name="active"/>
</group>
</group>
<group groups="base.group_hr_user" string="Social IDs">
<field name="identification_id"/>
<field name="passport_id"/>
<field name="otherid"/>
<field name="notes" placeholder="Other Information ..." colspan="4"/>
</page>
<page string="Personal Information" groups="base.group_hr_user">
<group col="4">
<group>
<field name="country_id"/>
<field name="bank_account_id"/>
<field name="address_home_id"/>
</group>
<group>
<field name="gender"/>
<field name="marital"/>
<field name="birthday"/>
</group>
</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_location"/>
</group>
<group string="Job Information">
<field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
<field name="coach_id"/>
</group>
</group>
</page>
<page string="Categories" groups="base.group_hr_user">
<field name="category_ids" widget="many2many_tags"/>
</page>
<page string="Notes" groups="base.group_hr_user">
<field name="notes"/>
</page>
</notebook>
</page>
</notebook>
</sheet>
</form>
</field>
@@ -359,16 +363,25 @@
<field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
</header>
<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>
<label for="employee_ids" class="oe_edit_only"/>
<h2>
<field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
</h2>
<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="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>
<notebook>
@@ -378,9 +391,6 @@
<label for="requirements"/>
<field name="requirements"/>
</page>
<page string="Employees" groups="base.group_user">
<field name="employee_ids" widget="many2many" mode="tree,form"/>
</page>
</notebook>
</sheet>
</form>
addons/hr_attendance/hr_attendance_view.xml
+7 -6
View File
@@ -133,12 +133,13 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<field name="coach_id" position="after">
<group colspan="2">
<field name="state"/>
<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"/>
<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"/>
</group>
<field name="active" position="before">
<label for="state"/>
<div>
<field name="state" class="oe_inline"/>
<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"/>
<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>
</record>
addons/hr_contract/hr_contract.py
+1 -1
View File
@@ -44,7 +44,7 @@ class hr_employee(osv.osv):
'place_of_birth': fields.char('Place of Birth', size=30),
'children': fields.integer('Number of Children'),
'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_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
}
addons/hr_contract/hr_contract_view.xml
+51 -38
View File
@@ -8,30 +8,32 @@
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<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"/>
<field name="place_of_birth"/>
<data>
<xpath expr="//field[@name='parent_id']" position="before">
<field name="manager"/>
</xpath>
<xpath expr="//group[@name='active_group']" position="before">
<group>
<field name="vehicle"/>
<field name="vehicle_distance"/>
</group>
</xpath>
<field name="active" position="before">
<field name="medic_exam" string="Medical Exam"/>
</field>
<field name="birthday" position="before">
<field name="children"/>
</group>
<group colspan="2" col="2">
<separator string="Job Info" colspan="2"/>
<field name="manager" />
<field name="vehicle" />
<field name="vehicle_distance" />
</group>
<group colspan="2" col="2">
<separator string="Others Info" colspan="2"/>
<field name="medic_exam" />
</group>
</page>
</page>
</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>
</record>
<record id="hr_contract_view_search" model="ir.ui.view">
<field name="name">hr.contract.view.search</field>
<field name="model">hr.contract</field>
@@ -67,34 +69,45 @@
<field name="arch" type="xml">
<form string="Contract" version="7.0">
<sheet>
<group col="4">
<field name="name" />
<field name="employee_id" />
<field name="job_id"/>
<field name="wage"/>
<field name="type_id"/>
</group>
<div class="oe_title">
<h1>
<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"/>
</div>
<div>
<label for="type_id" class="oe_edit_only"/>
<field name="type_id"/>
</div>
</h2>
</div>
<notebook>
<page string="Information" name="information">
<group>
<group name="left_column" string="Duration">
<field name="date_start" />
<field name="date_end" />
<group name="salary_and_advantages" string="Salary and Advantages">
<field name="wage"/>
<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"/>
</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>
<separator string="Notes"/>
<field name="notes"/>
</page>
<page string="Work Permit">
<group string="Valid for">
<group col="4">
<field name="visa_no"/>
<field name="permit_no"/>
<field name="visa_expire"/>
addons/hr_evaluation/hr_evaluation_view.xml
+59 -48
View File
@@ -28,11 +28,15 @@
<field name="arch" type="xml">
<form string="Appraisal Plan" version="7.0">
<group col="4">
<field name="name"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="month_first"/>
<field name="month_next"/>
<field name="active"/>
<group>
<field name="name"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="active"/>
</group>
<group>
<field name="month_first"/>
<field name="month_next"/>
</group>
</group>
<notebook>
<page string="Appraisal Phases">
@@ -133,10 +137,12 @@
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<page string="Notes" position="before">
<page string="Personal Information" position="after">
<page string="Appraisal" groups="base.group_hr_user">
<field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
<field name="evaluation_date"/>
<group col="4">
<field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
<field name="evaluation_date"/>
</group>
</page>
</page>
</field>
@@ -157,49 +163,50 @@
<field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
</header>
<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 string="Appraisal Data">
<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">
<group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
<field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
<field name="date_close" readonly="1"/>
</group>
</group>
<notebook>
<page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
<field name="survey_request_ids">
<form string="Interview Appraisal" version="7.0">
<group col="4">
<group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
<field nolabel="1" name="survey_request_ids">
<form string="Interview Appraisal" version="7.0">
<div class="oe_right oe_button_box">
<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)]}" />
</div>
<group>
<group>
<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.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>
<field name="date_deadline"/>
<field name="response" readonly="1"/>
<field name="user_to_review_id"/>
<field name="user_id" string="Interviewer"/>
</group>
<group col="4" string="Status">
<field name="state"/>
<div>
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
</div>
<group>
<field name="date_deadline"/>
<field name="response" readonly="1"/>
</group>
</form>
</field>
</page>
<page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
<field name="note_action"
groups="base.group_hr_manager"/>
</page>
<page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
<field name="note_summary"/>
</page>
</notebook>
</group>
<group col="4" string="Status" invisible="1">
<field name="state"/>
<div>
<button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
</div>
</group>
</form>
</field>
</group>
<group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
<field nolabel="1" name="note_action"
groups="base.group_hr_manager" placeholder="Appraisal Summary..."/>
</group>
<group string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
<field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
</group>
</sheet>
</form>
</field>
@@ -279,13 +286,17 @@
<field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
</header>
<sheet>
<group col="4">
<field name="user_to_review_id"/>
<field name="user_id" string="Interviewer"/>
<field name="date_deadline"/>
<field name="survey_id"/>
<field name="evaluation_id"/>
<field name="response" readonly="1"/>
<group>
<group>
<field name="survey_id"/>
<field name="user_to_review_id"/>
<field name="user_id" string="Interviewer"/>
</group>
<group>
<field name="date_deadline"/>
<field name="response" readonly="1"/>
<field name="evaluation_id" string="Appraisal Plan"/>
</group>
</group>
</sheet>
</form>
addons/hr_expense/hr_expense.py
+1 -1
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]
_name = "hr.expense.expense"
_inherit = ['mail.thread']
_description = "Expense"
_order = "id desc"
_columns = {
'name': fields.char('Description', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True),
'ref': fields.char('Reference', size=32),
'date': fields.date('Date', select=True),
'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),
addons/hr_expense/hr_expense_view.xml
+33 -32
View File
@@ -49,7 +49,6 @@
<field name="employee_id"/>
<field name="date"/>
<field name="department_id"/>
<field name="ref"/>
<field name="name"/>
<field name="amount"/>
<field name="state"/>
@@ -74,38 +73,44 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header>
<sheet>
<group col="4">
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="name"/>
<field name="ref"/>
<field name="date"/>
<field name="currency_id"/>
<field name="department_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<group>
<group>
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="date"/>
<field name="department_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group>
<field name="name"/>
<field name="user_valid"/>
<field name="currency_id"/>
</group>
</group>
<notebook>
<page string="Description">
<field name="line_ids" context="{'currency_id': currency_id}">
<form string="Expense Lines" version="7.0">
<group col="6" colspan="4">
<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"/>
<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"/>
<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="name"/>
<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>
</form>
</field>
<separator string="Notes"/>
<field name="note" placeholder="Free Notes"/>
</page>
<page string="Other Info">
<group>
@@ -113,17 +118,13 @@
<field name="journal_id"/>
<field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
</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>
<separator string="Notes"/>
<field name="note"/>
</page>
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
</record>
addons/hr_expense/report/expense.rml
+2 -2
View File
@@ -160,7 +160,7 @@
<para style="terp_tblheader_General_Centre">Date</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Reference</para>
<para style="terp_tblheader_General_Centre">Description</para>
</td>
<td>
<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>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.ref ]]</para>
<para style="terp_default_Centre_8">[[ o.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>
addons/hr_holidays/hr_holidays_view.xml
+58 -40
View File
@@ -110,29 +110,39 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
</header>
<sheet string="Leave Request">
<group col="8" colspan="4">
<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"/>
<group attrs="{'invisible':[('holiday_type','=','employee')]}">
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
<group>
<group>
<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="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')], '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 attrs="{'invisible':[('holiday_type','=','category')]}">
<field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
<group>
<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>
<notebook colspan="4">
<page string="General">
<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')]}" groups="base.group_hr_user"/>
<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"/>
<group>
<group>
<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"/>
</group>
</group>
<newline/>
<field name="manager_id" groups="base.group_no_one"/>
<field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
<separator string="Reasons" colspan="4"/>
<field name="notes" nolabel="1" colspan="4"/>
<field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
</page>
</notebook>
</sheet>
@@ -159,26 +169,29 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
</header>
<sheet>
<group>
<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="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')]}"/>
</group>
<notebook>
<page string="General">
<group col="4">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
<group>
<group>
<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="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="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="manager_id"/>
<field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
</group>
<separator string="Reasons"/>
<field name="notes"/>
</page>
</notebook>
<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>
<notebook>
<page string="General">
<group col="4">
<field name="double_validation" invisible="1"/>
<field name="manager_id"/>
<field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
</group>
<field name="notes" placeholder="Add a reason..."/>
</page>
</notebook>
</sheet>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
@@ -342,7 +355,7 @@
<record model="ir.actions.act_window.view" id="action_request_approve_holidays_form">
<field name="sequence" eval="2"/>
<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"/>
</record>
@@ -409,8 +422,7 @@
<form string="Leave Type" version="7.0">
<group col="4">
<field name="name"/>
<field name="color_name"/>
<field name="categ_id" widget="selection"/>
<field name="categ_id"/>
</group>
<notebook>
<page string="Details">
@@ -420,6 +432,7 @@
<field name="limit"/>
</group>
<group name="second" string="Misc">
<field name="color_name"/>
<field name="active"/>
</group>
</group>
@@ -529,8 +542,13 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<field name="coach_id" position="after">
<field name="remaining_leaves"/>
<field name="active" position="before">
<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>
</record>
addons/hr_payroll/hr_payroll_view.xml
+64 -50
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_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 -->
<record id="hr_contract_form_inherit" model="ir.ui.view">
<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="arch" type="xml">
<data>
<xpath expr="//group[@name='right_column']" position="before">
<separator string="Payslip Info" colspan="2"/>
<xpath expr="//field[@name='wage']" position="after">
<field name="struct_id" required="1"/>
</xpath>
<xpath expr="//field[@name='working_hours']" position="after">
@@ -105,7 +74,7 @@
<field name="model">hr.payroll.structure</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Employee Function">
<form string="Employee Function" version="7.0">
<group col="4">
<field name="name"/>
<field name="code"/>
@@ -249,6 +218,12 @@
</tree>
</field>
</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">
<field name="name">hr.payslip.form</field>
@@ -265,13 +240,18 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
<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>
<label for="date_from" class="oe_edit_only" string="Period"/>
<h2>
from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
to <field name="date_to"/>
</h2>
<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"/>
<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"/>
<h2>
From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
to <field name="date_to"/>
</h2>
</div>
<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="number"/>
@@ -281,6 +261,7 @@
</group>
<notebook>
<page string="Worked Days &amp; Inputs">
<separator string="Worked Days"/>
<field name="worked_days_line_ids">
<tree string="Worked Days" editable="bottom">
<field name="name"/>
@@ -302,6 +283,7 @@
</group>
</form>
</field>
<separator string="Other Inputs"/>
<field name="input_line_ids" colspan="4" nolabel="1">
<tree string="Input Data" editable="bottom">
<field name="name"/>
@@ -360,14 +342,18 @@
</field>
</page>
<page string="Other Information">
<group col="2" string="Other Information">
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="payslip_run_id" domain="[('state','=','draft')]"/>
<field name="paid" readonly="1"/>
</group>
<group string="Notes">
<field name="note"/>
<group>
<group string="Miscellaneous">
<field name="company_id" groups="base.group_multi_company"/>
<field name="payslip_run_id" domain="[('state','=','draft')]"/>
</group>
<group name="accounting" string="Accounting">
<field name="paid" readonly="1"/>
</group>
</group>
<div colspan="4">
<field name="note" Placeholder="Add an internal note..."/>
</div>
</page>
</notebook>
</sheet>
@@ -413,7 +399,27 @@
<field name="search_view_id" ref="view_hr_payslip_filter"/>
</record>
<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-->
<record id="hr_salary_rule_category_form" model="ir.ui.view">
<field name="name">hr.salary.rule.category.form</field>
@@ -730,12 +736,20 @@
<field name="state" widget="statusbar"/>
</header>
<sheet>
<group col="4">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
<field name="credit_note"/>
<field name="date_start"/>
</h1>
<h2>
Period from
<field name="date_start"/>
to
<field name="date_end"/>
</h2>
<group col="4">
<field name="credit_note"/>
</group>
<separator string="Payslips"/>
<field name="slip_ids"/>
</sheet>
</form>
addons/hr_payroll_account/hr_payroll_account_view.xml
+14 -14
View File
@@ -2,8 +2,6 @@
<openerp>
<data>
<record model="ir.ui.view" id="view_hr_payslip_inherit_form">
<field name="name">hr.payslip.inherit.form</field>
<field name="model">hr.payslip</field>
@@ -27,10 +25,12 @@
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
<page string="Accounting">
<field name="account_debit" />
<field name="account_credit"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_tax_id"/>
<group colspan="4">
<field name="account_debit" />
<field name="account_credit"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="account_tax_id"/>
</group>
</page>
</xpath>
</field>
@@ -44,14 +44,15 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='advantages']" position="after">
<separator colspan="4" string="Accounting"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="journal_id"/>
<xpath expr="//group[@name='duration_group']" position="after">
<group string="Accounting">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="journal_id"/>
</group>
</xpath>
</field>
</record>
<!-- Payslip Run View -->
<record id="hr_payslip_run_search_inherit" model="ir.ui.view">
@@ -85,12 +86,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
<field name="arch" type="xml">
<field name="date_end" position="after">
<newline/>
<field name="credit_note" position="before">
<field name="journal_id"/>
</field>
</field>
</record>
</data>
</openerp>
addons/hr_recruitment/hr_recruitment.py
+2 -2
View File
@@ -181,7 +181,7 @@ class hr_applicant(base_stage, osv.Model):
return res
_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."),
'description': fields.text('Description'),
'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_proposed': fields.float('Proposed Salary', help="Salary Proposed by the Organisation"),
'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_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32),
addons/hr_recruitment/hr_recruitment_view.xml
+54 -54
View File
@@ -150,58 +150,58 @@
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="partner_name" class="oe_edit_only"/>
<h2><field name="partner_name"/></h2>
<field name="type_id" placeholder="Degree"/>
<h2>
<field name="partner_name" class="oe_inline"/>
</h2>
</div>
<group>
<group>
<field name="user_id"/>
<field name="title_action"/>
<field name="date_action"/>
<group string="Contact Details">
<field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)"/>
<field name="email_from" widget="email"/>
<field name="partner_phone"/>
<field name="partner_mobile"/>
<field name="type_id" placeholder="Degree"/>
</group>
<group>
<field name="job_id" on_change="onchange_job(job_id)"/>
<field name="priority" string="Appreciation"/>
<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="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
<field name="state" groups="base.group_no_one"/>
<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 string="Reference">
<field name="source_id"/>
<field name="reference"/>
</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)"/>
<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="partner_phone"/>
<field name="partner_mobile"/>
</group>
<group string="Reference">
<field name="source_id"/>
<field name="reference"/>
</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>
<separator string="Details"/>
<field name="description"/>
</page>
</notebook>
<separator string="Application Summary"/>
<field name="description" placeholder="Feedback of interviews..."/>
</sheet>
<footer>
<field name="message_ids" widget="mail_thread"/>
@@ -371,15 +371,15 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_hr_job_form"/>
<field name="arch" type="xml">
<field name="expected_employees" version="7.0" position="after">
<label for="survey_id" />
<div>
<field name="survey_id" class="oe_inline"/>
<button class="oe_inline"
string="Interview" icon="gtk-print"
name="action_print_survey" type="object"
attrs="{'invisible':[('survey_id','=',False)]}"/>
</div>
<field name="no_of_recruitment" version="7.0" position="after">
<label for="survey_id" />
<div>
<field name="survey_id" class="oe_inline"/>
<button class="oe_inline"
string="Interview" icon="gtk-print"
name="action_print_survey" type="object"
attrs="{'invisible':[('survey_id','=',False)]}"/>
</div>
</field>
</field>
</record>
addons/hr_timesheet/hr_timesheet_view.xml
+33 -20
View File
@@ -26,29 +26,38 @@
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet Lines">
<group col="4">
<field name="name" colspan="4"/>
<field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
<field name="date" on_change="on_change_date(date)"/>
<form string="Timesheet Lines" version="7.0">
<sheet>
<group>
<group>
<field name="name"/>
<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)"/>
</group>
</group>
<notebook>
<page string="Information">
<group>
<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_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
</group>
<group string="Accounting">
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id"/>
<field name="amount"/>
<field name="general_account_id"/>
<field name="journal_id"/>
</group>
<group>
<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')]"/>
<label string="Quantity" for="unit_amount"/>
<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 string="Accounting">
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
<field name="amount"/>
<field name="general_account_id"/>
<field name="journal_id"/>
</group>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@@ -112,10 +121,14 @@
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<page string="Categories" position="after">
<page string="Personal Information" position="after">
<page string="Timesheets" groups="base.group_hr_user">
<field name="product_id" domain="[('type','=','service')]"/>
<field name="journal_id" widget="selection"/>
<group>
<group col="2">
<field name="product_id" domain="[('type','=','service')]"/>
<field name="journal_id"/>
</group>
</group>
</page>
</page>
</field>
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+51 -36
View File
@@ -62,39 +62,50 @@
<label for="employee_id" class="oe_edit_only"/>
<h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
<label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
<h2>
From <field name="date_from"/>
to <field name="date_to"/>
</h2>
<group col="4">
<field name="name"/>
<field name="department_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="user_id" invisible="1"/>
<h2>From <field name="date_from"/> to <field name="date_to"/></h2>
<group>
<group>
<field name="name"/>
<field name="department_id"/>
<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"/>
</group>
</group>
<notebook>
<page string="Daily">
<group col="6" colspan="4">
<button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
<field name="date_current" nolabel="1"/>
<label string=""/>
<button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
<button name="date_today" string="Today" type="object" icon="terp-go-today"/>
<button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
<group>
<div>
<button name="button_dummy" class="oe_inline" string="Go to" type="object" icon="terp-gtk-jump-to-ltr"/> :
<field name="date_current" class="oe_inline"/>
</div>
<div align="right">
<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>
<field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1">
<tree string="Attendances" editable="bottom">
<field name="name"/>
<field name="action"/>
<field invisible="1" name="employee_id"/>
</tree>
</field>
<group col="4" colspan="1">
<group colspan="4" col="3">
<field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
<tree string="Attendances" editable="bottom">
<field name="name"/>
<field name="action"/>
<field invisible="1" name="employee_id"/>
</tree>
</field>
<group>
<div align="right">
<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"/>
</div>
</group>
</group>
<group col="4">
<field name="state_attendance"/>
<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"/>
<field name="total_attendance_day" widget="float_time" colspan="4"/>
</group>
<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">
@@ -124,8 +135,6 @@
<field name="user_id" required="1"/>
</form>
</field>
<field name="total_difference_day" widget="float_time"/>
<field name="total_timesheet_day" widget="float_time"/>
</page>
<page string="Summary">
<field colspan="4" name="period_ids" nolabel="1">
@@ -136,11 +145,6 @@
<field name="total_difference" widget="float_time"/>
</tree>
</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>
</notebook>
</sheet>
@@ -227,7 +231,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
<field name="arch" type="xml">
<field name="user_id" position="before">
<field name="date" position="before">
<field name="sheet_id"/>
</field>
</field>
@@ -349,6 +353,17 @@
<act_window
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"/>
<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>
</openerp>
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+4 -10
View File
@@ -9,23 +9,17 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<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="car_company_amount"/>
<field name="car_employee_deduction"/>
<field name="misc_onss_deduction"/>
<field name="meal_voucher_amount"/>
<field name="meal_voucher_employee_deduction"/>
<field name="misc_advantage_amount"/>
<separator string="Miscellaneous" colspan="2"/>
<field name="additional_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="meal_voucher_employee_deduction"/>
<field name="car_employee_deduction"/>
</group>
<field name="insurance_employee_deduction"/>
</xpath>
</data>
</field>
addons/mail/static/src/js/mail.js
+10 -2
View File
@@ -91,7 +91,7 @@ openerp.mail = function(session) {
this.params = params;
this.params.parent_id = this.params.parent_id || false;
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.offset = this.params.offset || 0;
this.params.records = this.params.records || null;
@@ -304,7 +304,6 @@ openerp.mail = function(session) {
// format date according to the user timezone
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});
$(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
// expand feature
@@ -635,6 +634,7 @@ openerp.mail = function(session) {
start: function () {
this._super.apply(this, arguments);
var self = this;
this.display_current_user();
// add events
this.add_event_handlers();
// 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
* @param {Number} limit: number of notifications to fetch
addons/mail/static/src/xml/mail.xml
+1 -3
View File
@@ -56,9 +56,7 @@
<div t-name="mail.Thread" class="oe_mail oe_mail_thread">
<div class="oe_mail_thread_action">
<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 = '';"/>
</div>
<textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
</div>
<div class="oe_mail_thread_display"></div>
<div class="oe_mail_thread_more">
addons/marketing_campaign/marketing_campaign.py
+1 -1
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')),
'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'),
'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.")
}
addons/marketing_campaign/marketing_campaign_view.xml
+58 -33
View File
@@ -9,6 +9,22 @@
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">
<field name="name">marketing.campaign.form</field>
@@ -24,20 +40,30 @@
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>
<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 string="Campaign">
<field name="name"/>
<group>
<field name="mode"/>
<field name="fixed_cost"/>
</group>
<group string="Resource">
<group>
<field name="object_id"/>
<field name="partner_field_id"/>
<field name="unique_field_id"/>
</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}" />
</sheet>
</form>
@@ -143,16 +169,11 @@
</header>
<sheet string="Segments" >
<group>
<group string="Segment">
<group>
<field name="name"/>
<field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
<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"/>
<div>
<field name="sync_last_date" class="oe_inline"/>
@@ -160,7 +181,8 @@
</div>
<field name="date_next_sync"/>
</group>
<group string="History">
<group>
<field name="ir_filter_id"/>
<field name="date_run" readonly="1"/>
<field name="date_done" readonly="1"/>
</group>
@@ -243,33 +265,34 @@
<field name="arch" type="xml">
<form string="Activities" version="7.0">
<group>
<group string="Activity">
<group>
<field name="name"/>
<field name="signal" groups="base.group_no_one"/>
<field name="start"/>
<field name="object_id" invisible="1"/>
<field name="campaign_id" invisible="1"/>
</group>
<group string="Cost / Revenue">
<group>
<field name="variable_cost"/>
<field name="revenue"/>
</group>
</group>
<group string="Condition" col="4">
<field name="condition" widget="char" colspan="4"/>
<field name="keep_if_condition_not_met"/>
</group>
<group col="4">
<separator string="Action" colspan="4"/>
<field name="type"/>
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
<group >
<group>
<field name="condition" widget="char"/>
<field name="keep_if_condition_not_met"/>
</group>
<group>
<field name="type"/>
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
context="{'default_model_id':object_id}" />
<field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_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="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_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')]}"/>
</group>
</group>
<separator string="Transitions"/>
<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">
<field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name='trigger'/>
@@ -285,7 +308,8 @@
</group>
</form>
</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">
<field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
<field name='trigger'/>
@@ -363,12 +387,13 @@
</header>
<sheet>
<group>
<group string="Campaign Step">
<group>
<field name="campaign_id"/>
<field name="segment_id"/>
<field name="activity_id" context="{'segment_id':segment_id}"/>
<field name="date"/>
</group><group string="Related Resource">
</group>
<group>
<field name="object_id" readonly="True"/>
<field name="res_name"/>
<field name="res_id"/>
addons/mrp/mrp_view.xml
+2 -3
View File
@@ -957,9 +957,8 @@
</xpath>
<xpath expr="//field[@name='close_move']" position="after">
<group colspan="4" groups="product.group_mrp_properties">
<separator colspan="4" string="Properties" />
<field colspan="4" name="property_ids" nolabel="1"/>
</group>
<field colspan="4" name="property_ids" widget="many2many_tags"/>
</group>
</xpath>
</data>
</field>
addons/project/project_view.xml
+1 -1
View File
@@ -239,7 +239,7 @@
<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 class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu">
<li><a type="edit">Edit...</a></li>
<li><a type="delete">Delete</a></li>
addons/sale/sale_view.xml
+1 -2
View File
@@ -235,9 +235,8 @@
<field name="delay"/>
<field name="th_weight"/>
<field name="address_allotment_id"/>
<field name="property_ids" widget="many2many_tags"/>
</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..."/>
<div groups="base.group_no_one">
<separator colspan="4" string="Invoice Lines"/>
addons/stock_planning/i18n/ja.po
+69 -60
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-07-04 02:25+0000\n"
"PO-Revision-Date: 2012-07-04 23:38+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-07-04 04:38+0000\n"
"X-Launchpad-Export-Date: 2012-07-05 04:49+0000\n"
"X-Generator: Launchpad (build 15544)\n"
#. module: stock_planning
@@ -453,7 +453,7 @@ msgstr "調達履歴"
msgid ""
"Unit of Measure used to show the quantities of stock calculation.You can use "
"units from default category or from second category (UoS category)."
msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（単位分類）から単位を使うことができます。"
msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使うことができます。"
#. module: stock_planning
#: view:stock.period.createlines:0
@@ -541,7 +541,7 @@ msgstr "この会社の期間5"
#. module: stock_planning
#: field:stock.sale.forecast,product_uom:0
msgid "Product UoM"
msgstr ""
msgstr "製品単位"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_company:0
@@ -619,7 +619,7 @@ msgstr "倉庫 "
msgid ""
"Unit of Measure used to show the quantities of stock calculation.You can use "
"units form default category or from second category (UoS category)."
msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（単位の分類）から単位を使用することができます。"
msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使用することができます。"
#. module: stock_planning
#: view:stock.planning:0
@@ -709,7 +709,7 @@ msgstr "在庫計画行の作成"
#. module: stock_planning
#: view:stock.planning:0
msgid "General Info"
msgstr ""
msgstr "一般情報"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
@@ -744,14 +744,14 @@ msgstr "在庫供給場所"
#. module: stock_planning
#: help:stock.period.createlines,date_stop:0
msgid "Ending date for planning period."
msgstr ""
msgstr "計画期間の終了日"
#. module: stock_planning
#: help:stock.planning.createlines,forecasted_products:0
msgid ""
"Check this box to create planning for all products having any forecast for "
"selected Warehouse and Period. Product Category field will be ignored."
msgstr ""
msgstr "選択した倉庫と期間の全ての製品が任意の予測を持つための計画を作成するにはこのボックスをチェックします。製品分類項目は無視されます。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:632
@@ -759,19 +759,19 @@ msgstr ""
#: code:addons/stock_planning/stock_planning.py:702
#, python-format
msgid "MPS(%s) %s"
msgstr ""
msgstr "MPS（%s）%s"
#. module: stock_planning
#: field:stock.planning,already_in:0
msgid "Already In"
msgstr ""
msgstr "既入庫"
#. module: stock_planning
#: field:stock.planning,product_uom_categ:0
#: field:stock.planning,product_uos_categ:0
#: field:stock.sale.forecast,product_uom_categ:0
msgid "Product UoM Category"
msgstr ""
msgstr "製品単位分類"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
@@ -798,6 +798,10 @@ msgid ""
"can trigger the procurement of what is missing to reach your desired "
"quantities"
msgstr ""
"マスタ調達スケジュールは倉庫の補充のための主な操縦者になることができ、または自動MRPスケジューリング（最小在庫ルール他）を補完します。\n"
"各MPS行は現在と未来の在庫レベルを基本として、計画された在庫移動と同様、与えられた倉庫の中の与えられた在庫期間のために、与えられた製品の入庫と出庫の前も"
"って計算された概観を与えます。予測数量は手動で変更することができます。そしてシミュレート結果の在庫数量に満足したなら、希望の数量に到達しないものの調達のき"
"っかけとすることができます。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:685
@@ -834,48 +838,48 @@ msgstr ""
#: field:stock.sale.forecast,period_id:0
#: field:stock.sale.forecast.createlines,period_id:0
msgid "Period"
msgstr ""
msgstr "期間"
#. module: stock_planning
#: field:stock.sale.forecast,product_uos_categ:0
msgid "Product UoS Category"
msgstr ""
msgstr "製品販売単位分類"
#. module: stock_planning
#: field:stock.planning,active_uom:0
#: field:stock.sale.forecast,active_uom:0
msgid "Active UoM"
msgstr ""
msgstr "アクティブな単位"
#. module: stock_planning
#: view:stock.planning:0
msgid "Search Stock Planning"
msgstr ""
msgstr "在庫計画の検索"
#. module: stock_planning
#: field:stock.sale.forecast.createlines,copy_forecast:0
msgid "Copy Last Forecast"
msgstr ""
msgstr "最終予測のコピー"
#. module: stock_planning
#: help:stock.sale.forecast,product_id:0
msgid "Shows which product this forecast concerns."
msgstr ""
msgstr "この予測に関連する製品の表示"
#. module: stock_planning
#: selection:stock.planning,state:0
msgid "Done"
msgstr ""
msgstr "完了"
#. module: stock_planning
#: field:stock.period.createlines,period_ids:0
msgid "Periods"
msgstr ""
msgstr "期間"
#. module: stock_planning
#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
msgid "Create Stock Periods"
msgstr ""
msgstr "在庫期間の作成"
#. module: stock_planning
#: view:stock.period:0
@@ -883,7 +887,7 @@ msgstr ""
#: view:stock.planning.createlines:0
#: view:stock.sale.forecast.createlines:0
msgid "Close"
msgstr ""
msgstr "閉じる"
#. module: stock_planning
#: view:stock.sale.forecast:0
@@ -895,47 +899,47 @@ msgstr "検証済"
#: view:stock.period:0
#: selection:stock.period,state:0
msgid "Open"
msgstr ""
msgstr "開く"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,copy_forecast:0
msgid "Copy quantities from last Stock and Sale Forecast."
msgstr ""
msgstr "最終在庫と受注予測から数量をコピー"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_dept:0
msgid "This Dept Period1"
msgstr ""
msgstr "この部門の期間1"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_dept:0
msgid "This Dept Period3"
msgstr ""
msgstr "この部門の期間3"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_dept:0
msgid "This Dept Period2"
msgstr ""
msgstr "この部門の期間2"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_dept:0
msgid "This Dept Period5"
msgstr ""
msgstr "この部門の期間5"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_dept:0
msgid "This Dept Period4"
msgstr ""
msgstr "この部門の期間4"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
msgid "This Warehouse Period2"
msgstr ""
msgstr "この倉庫の期間2"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
msgid "This Warehouse Period3"
msgstr ""
msgstr "この倉庫の期間3"
#. module: stock_planning
#: help:stock.planning,stock_supply_location:0
@@ -944,38 +948,39 @@ msgid ""
"supply will be made from Output location of Supply Warehouse. Used in "
"'Supply from Another Warehouse' with Supply Warehouse."
msgstr ""
"供給倉庫の在庫場所から供給する場合はチェックします。チェックしない場合は供給倉庫の出力場所から供給されます。供給倉庫の他の倉庫場所から供給で使用されます。"
#. module: stock_planning
#: field:stock.sale.forecast,create_uid:0
msgid "Responsible"
msgstr ""
msgstr "担当"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Default UOM"
msgstr ""
msgstr "デフォルト単位"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
msgid "This Warehouse Period4"
msgstr ""
msgstr "この倉庫の期間4"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
msgid "This Warehouse Period5"
msgstr ""
msgstr "この倉庫の期間5"
#. module: stock_planning
#: view:stock.period:0
msgid "Current"
msgstr ""
msgstr "現在"
#. module: stock_planning
#: help:stock.planning,supply_warehouse_id:0
msgid ""
"Warehouse used as source in supply pick move created by 'Supply from Another "
"Warehouse'."
msgstr ""
msgstr "倉庫は、他の倉庫からの供給によって作成された、供給集荷移動の元として使用されます。"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_planning
@@ -993,12 +998,12 @@ msgstr "この予測がどの倉庫に関連するかを表示します。在庫
#: code:addons/stock_planning/stock_planning.py:661
#, python-format
msgid "%s Procurement (%s, %s) %s %s \n"
msgstr ""
msgstr "%s 調達 (%s, %s) %s %s \n"
#. module: stock_planning
#: field:stock.sale.forecast,analyze_company:0
msgid "Per Company"
msgstr ""
msgstr "会社毎"
#. module: stock_planning
#: help:stock.planning,to_procure:0
@@ -1006,42 +1011,42 @@ msgid ""
"Enter quantity which (by your plan) should come in. Change this value and "
"observe Stock simulation. This value should be equal or greater than "
"Confirmed In."
msgstr ""
msgstr "入庫すべき（計画による）数量を入力します。この値を変更し、在庫シミュレーションを観察します。この値は確認済入庫以上である必要があります。"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_company:0
msgid "This Company Period4"
msgstr ""
msgstr "この会社の期間4"
#. module: stock_planning
#: help:stock.planning.createlines,period_id:0
msgid "Period which planning will concern."
msgstr ""
msgstr "計画が関連する期間"
#. module: stock_planning
#: field:stock.planning,already_out:0
msgid "Already Out"
msgstr ""
msgstr "既出庫"
#. module: stock_planning
#: help:stock.planning,product_id:0
msgid "Product which this planning is created for."
msgstr ""
msgstr "この計画が作成される対象の製品"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Per Warehouse :"
msgstr ""
msgstr "倉庫毎："
#. module: stock_planning
#: field:stock.planning,history:0
msgid "Procurement History"
msgstr ""
msgstr "調達履歴"
#. module: stock_planning
#: help:stock.period.createlines,date_start:0
msgid "Starting date for planning period."
msgstr ""
msgstr "開始期間の開始日"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
@@ -1051,48 +1056,48 @@ msgstr ""
#: view:stock.period:0
#: view:stock.period.createlines:0
msgid "Stock Periods"
msgstr ""
msgstr "在庫期間"
#. module: stock_planning
#: view:stock.planning:0
msgid "Stock"
msgstr ""
msgstr "在庫"
#. module: stock_planning
#: help:stock.planning,incoming:0
msgid "Quantity of all confirmed incoming moves in calculated Period."
msgstr ""
msgstr "計算された期間の全ての確認済入庫移動の数量"
#. module: stock_planning
#: field:stock.period,date_stop:0
#: field:stock.period.createlines,date_stop:0
msgid "End Date"
msgstr ""
msgstr "終了日"
#. module: stock_planning
#: view:stock.planning:0
msgid "No Requisition"
msgstr ""
msgstr "命令書なし"
#. module: stock_planning
#: field:stock.sale.forecast,name:0
msgid "Name"
msgstr ""
msgstr "名称"
#. module: stock_planning
#: help:stock.sale.forecast,period_id:0
msgid "Shows which period this forecast concerns."
msgstr ""
msgstr "この予測が関連する期間を表示"
#. module: stock_planning
#: field:stock.planning,product_uom:0
msgid "UoM"
msgstr ""
msgstr "単位"
#. module: stock_planning
#: view:stock.period:0
msgid "Closed Periods"
msgstr ""
msgstr "閉鎖済期間"
#. module: stock_planning
#: view:stock.planning:0
@@ -1100,7 +1105,7 @@ msgstr ""
#: view:stock.sale.forecast:0
#: field:stock.sale.forecast,product_id:0
msgid "Product"
msgstr ""
msgstr "製品"
#. module: stock_planning
#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
@@ -1113,13 +1118,13 @@ msgstr "受注予測"
#: field:stock.planning.createlines,product_categ_id:0
#: field:stock.sale.forecast.createlines,product_categ_id:0
msgid "Product Category"
msgstr ""
msgstr "製品分類"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:672
#, python-format
msgid "You must specify a Source Warehouse !"
msgstr ""
msgstr "元の倉庫を指定する必要があります。"
#. module: stock_planning
#: field:stock.planning,procure_to_stock:0
@@ -1136,7 +1141,7 @@ msgstr "承認"
msgid ""
"Period for this planning. Requisition will be created for beginning of the "
"period."
msgstr "この計画の期間。申請は期間の開始時に作成されます。"
msgstr "この計画の期間。命令書は期間の開始時に作成されます。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:631
@@ -1188,6 +1193,8 @@ msgid ""
"between Planned In and Confirmed In. For current period Already In is also "
"calculated. This value is used to create procurement for lacking quantity."
msgstr ""
"計画された入庫数量のために残された数量。これは計画入庫と確認済入庫の間の計算された差です。現在の期間のために、既入庫も計算されます。この値は不足数量のため"
"に調達を生成するのに使用されます。"
#. module: stock_planning
#: help:stock.planning,outgoing_left:0
@@ -1195,7 +1202,7 @@ msgid ""
"Quantity expected to go out in selected period besides Confirmed Out. As a "
"difference between Planned Out and Confirmed Out. For current period Already "
"Out is also calculated"
msgstr ""
msgstr "確認済出庫とは別に選択された期間に出庫すると期待される数量。計画出庫と確認済出庫の差です。現在期間の既出庫もまた計算されます。"
#. module: stock_planning
#: view:stock.sale.forecast:0
@@ -1209,3 +1216,5 @@ msgid ""
"you only have to fill in the forecast quantities. The wizard doesn't "
"duplicate the line when another one exist for the same selection."
msgstr ""
"このウィザードは一度に複数の予測行を作成するのを手助けします。それが作成された後、あなたは予測数量を埋める必要があります。同じ選択に対して同じものが存在す"
"る場合、ウィザードは行を重複させません。"
addons/survey/i18n/ja.po
+1710
View File
File diff suppressed because it is too large Load Diff
addons/web_livechat/LICENSE
-15
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/>.
addons/web_livechat/__init__.py
-22
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:
addons/web_livechat/__openerp__.py
-50
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:
addons/web_livechat/i18n/ar.po
-34
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 "تمكين الدعم الفني المباشر للحاصلين علي عقد دعم فني"
addons/web_livechat/i18n/bg.po
-34
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 поддръжка ако имате договор за поддръжка"
addons/web_livechat/i18n/ca.po
-35
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"
addons/web_livechat/i18n/cs.po
-28
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"
addons/web_livechat/i18n/da.po
-28
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 ""
addons/web_livechat/i18n/de.po
-34
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"
addons/web_livechat/i18n/es.po
-36
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"
addons/web_livechat/i18n/es_CR.po
-38
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"
addons/web_livechat/i18n/es_MX.po
-41
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"
addons/web_livechat/i18n/es_VE.po
-41
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"
addons/web_livechat/i18n/fi.po
-34
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"
addons/web_livechat/i18n/fr.po
-36
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"
addons/web_livechat/i18n/gl.po
-35
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"
addons/web_livechat/i18n/hr.po
-34
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"
addons/web_livechat/i18n/it.po
-35
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"
addons/web_livechat/i18n/ja.po
-28
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 ""
addons/web_livechat/i18n/nl.po
-35
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"
addons/web_livechat/i18n/oc.po
-36
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"
addons/web_livechat/i18n/pt.po
-36
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"
addons/web_livechat/i18n/pt_BR.po
-35
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"
addons/web_livechat/i18n/ro.po
-36
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ă."
addons/web_livechat/i18n/ru.po
-36
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 ""
#~ "Включить поддержку живого общения для тех, у кого есть договор на "
#~ "обслуживание"
addons/web_livechat/i18n/sk.po
-34
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"
addons/web_livechat/i18n/sl.po
-34
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"
addons/web_livechat/i18n/sr@latin.po
-34
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"
addons/web_livechat/i18n/sv.po
-28
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"
addons/web_livechat/i18n/tr.po
-34
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"
addons/web_livechat/i18n/web_livechat.pot
-46
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 ""
addons/web_livechat/i18n/zh_CN.po
-34
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 "其中一个维护合同支持在线交流"
addons/web_livechat/publisher_warranty.py
-48
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:
addons/web_livechat/static/src/css/lc.css
-7
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;
}
addons/web_livechat/static/src/img/available.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

addons/web_livechat/static/src/img/away.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

addons/web_livechat/static/src/img/busy.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

addons/web_livechat/static/src/js/web_livechat.js
-127
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));
}
}
};
addons/web_livechat/static/src/xml/web_livechat.xml
-10
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>
addons/web_shortcuts/static/src/css/web_shortcuts.css
+2 -2
View File
@@ -1,6 +1,6 @@
/* Shortcuts*/
.oe_systray_shortcuts {
margin: 3px;
.oe_systray_shortcuts .oe_star_off {
color: #eee;
}
.oe_shortcuts_toggle {
height: 20px;
addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+2 -2
View File
@@ -3,8 +3,8 @@
-->
<templates id="template" xml:space="preserve">
<t t-name="Systray.Shortcuts">
<div class="oe_systray_shortcuts oe_dropdown_toggle">
<a href="#"><img src="/web_shortcuts/static/src/img/icon.png" width="22" height="22" border="0"/></a>
<div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
<span class="oe_e oe_star_off">7</span>
<ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
</div>
</t>