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

[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-mma 

bzr revid: stw@openerp.com-20120725143446-2ir9qawtn20iimz2
This commit is contained in:
Stephane Wirtel 2012-07-25 16:34:46 +02:00
parent ac580aeae0 af71b1a653
commit 6a84f697b1
6 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_calendar/__openerp__.py
View File

@ -22,7 +22,7 @@
{
"name": "Calendar Layer",
"version": "1.0",
"depends": ["base", "base_status", "mail"],
"depends": ["base", "base_status", "mail", "base_action_rule"],
'description': """
This is a full-featured calendar system.
========================================

4
addons/base_calendar/base_calendar.py
View File

@ -1025,8 +1025,8 @@ class calendar_event(osv.osv):
'id': fields.integer('ID', readonly=True),
'sequence': fields.integer('Sequence'),
'name': fields.char('Description', size=64, required=False, states={'done': [('readonly', True)]}),
'date': fields.datetime('Date', states={'done': [('readonly', True)]}),
'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}),
'date': fields.datetime('Date', states={'done': [('readonly', True)]}, required=True,),
'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}, required=True,),
'create_date': fields.datetime('Created', readonly=True),
'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
'description': fields.text('Description', states={'done': [('readonly', True)]}),

2
addons/hr_contract/hr_contract_view.xml
View File

@ -28,7 +28,7 @@
<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 name="bank_account_id" context="{'display_partner':True}"/>
</field>
</data>
</field>

1
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -281,7 +281,6 @@
<button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
<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)]}" class="oe_highlight"/>
<button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
</header>

1
addons/hr_holidays/hr_holidays_view.xml
View File

@ -579,7 +579,6 @@
name="Leave Meetings"
src_model="hr.holidays"
res_model="crm.meeting"
domain="[('leave_id', '=', active_id)]"
view_mode="tree,form,calendar,gantt"
view_type="form"/>

18
addons/hr_payroll/hr_payroll_view.xml
View File

@ -634,7 +634,7 @@
<field name="child_ids"/>
</page>
<page string="Inputs">
<field name="input_ids" mode="tree, form">
<field name="input_ids" mode="tree">
<tree string="Input Data" editable="bottom">
<field name="name"/>
<field name="code"/>
@ -767,22 +767,6 @@
<!-- Shortcuts -->
<act_window name="Payslips"
domain="[('employee_id', '=', active_id)]"
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"/>
<act_window name="Payslip Computation Details"
domain="[('slip_id', '=', active_id)]"
context="{'default_slip_id': active_id}"
res_model="hr.payslip.line"
src_model="hr.payslip"
id="act_payslip_lines"/>
<act_window name="Payslip Lines"
domain="[('register_id', '=', active_id)]"
context="{'default_register_id': active_id, 'search_default_register_id': 1}"