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

[MERGE] Mutiple web issue fixed merge lp:~openerp-dev/openobject-addons/trunk-addons24-hr-rga 

bzr revid: jam@tinyerp.com-20121123103117-zmig1z5omwux27j3
This commit is contained in:
Jigar Amin 2012-11-23 16:01:17 +05:30
parent fd92e82911 544c5d0ba4
commit 00477a3149
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr/hr_view.xml
View File

@ -228,6 +228,7 @@
<field name="department_id"/>
<field name="job_id"/>
<field name="coach_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
</record>
@ -236,7 +237,7 @@
<field name="name">Subordinate Hierarchy</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.employee</field>
<field name="domain">[('id','in',active_ids)]</field>
<field name="domain">[('parent_id','=',False),('id','in',active_ids)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_partner_tree2"/>
</record>

1
addons/hr_timesheet_sheet/static/src/js/timesheet.js
View File

@ -14,6 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
date_to: false,
date_from: false,
});
this.updating = true;
this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
this.field_manager.on("field_changed:date_from", this, function() {
this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});