Merge lp:~openerp-dev/openerp-web/7.0-bug-1095562-vja into lp:openerp-web/7.0

Proposed by Vishmita Jadeja (openerp)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-bug-1095562-vja
Merge into: lp:openerp-web/7.0
Diff against target: 15 lines (+1/-1)
1 file modified
addons/web/static/src/js/view_form.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-bug-1095562-vja
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+145123@code.launchpad.net

Description of the change

Hello,

     After Click on 'Discard' button in My current timesheet,current form view should reload.

Thanks.

To post a comment you must log in.

Unmerged revisions

3699. By Vishmita Jadeja (openerp)

[Merge]Merge lp:openerp-web/7.0

3698. By Vishmita Jadeja (openerp)

[Fix]Clicking on Discard in Hr => Timetracking => My Current Timesheet has no effect

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/view_form.js'
2--- addons/web/static/src/js/view_form.js 2013-01-24 14:40:18 +0000
3+++ addons/web/static/src/js/view_form.js 2013-01-28 07:21:23 +0000
4@@ -722,10 +722,10 @@
5 },
6 on_button_cancel: function(event) {
7 if (this.can_be_discarded()) {
8+ this.to_view_mode();
9 if (this.get('actual_mode') === 'create') {
10 this.trigger('history_back');
11 } else {
12- this.to_view_mode();
13 this.trigger('load_record', this.datarecord);
14 }
15 }