From dc02b190452ded83946a7970abe3f869819e42cf Mon Sep 17 00:00:00 2001 From: vishmita Date: Fri, 11 May 2012 15:27:07 +0530 Subject: [PATCH 001/495] [FIX]when discard modification and click on next record from pager again it gives warning. lp bug: https://launchpad.net/bugs/997468 fixed bzr revid: vja@vja-desktop-20120511095707-jsqixg5c87u7itd4 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 27606a564be..4506005d822 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -546,6 +546,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form. }, on_button_cancel: function(event) { if (this.can_be_discarded()) { + this.on_record_loaded(this.datarecord); this.set({mode: "view"}); } return false; From 11edf8df8a09057ee9b5d90cccc6f128864a51a6 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 15 May 2012 17:15:38 +0530 Subject: [PATCH 002/495] [IMP] change HR Menu bzr revid: kjo@tinyerp.com-20120515114538-cja1xnu64scpm0um --- addons/hr/hr_view.xml | 2 +- .../wizard/hr_attendance_sign_in_out_view.xml | 36 ------------------- addons/hr_evaluation/hr_evaluation_view.xml | 2 +- .../hr_holidays_summary_department_view.xml | 4 +-- addons/hr_recruitment/hr_recruitment_menu.xml | 2 +- .../hr_timesheet_print_employee_view.xml | 2 +- .../wizard/hr_timesheet_print_users_view.xml | 2 +- .../hr_timesheet_analytic_profit_view.xml | 2 +- 8 files changed, 7 insertions(+), 45 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 4147ebc30a9..32032cdadaa 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -312,7 +312,7 @@ + parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/> Categories Structure diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml index 13ce91c79d4..a37ec4275d5 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml @@ -1,29 +1,6 @@ - - hr.sign.in.out.form - hr.sign.in.out - form - -
- -