diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index e8bf24fb27f..8e72e24eb22 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -11,7 +11,7 @@ openerp.account = function (instance) {
this._super.apply(this, arguments);
var self = this;
this.current_partner = null;
- this.do_select.add(function() {
+ this.on('record_selected', this, function() {
if (self.get_selected_ids().length === 0) {
self.$(".oe_account_recon_reconcile").attr("disabled", "");
} else {
@@ -19,7 +19,7 @@ openerp.account = function (instance) {
}
});
},
- on_loaded: function() {
+ load_list: function() {
var self = this;
var tmp = this._super.apply(this, arguments);
if (this.partners) {
@@ -102,7 +102,6 @@ openerp.account = function (instance) {
action_id: result[1],
context: additional_context
}).then(function (result) {
- result = result.result;
result.context = _.extend(result.context || {}, additional_context);
result.flags = result.flags || {};
result.flags.new_window = true;
@@ -121,6 +120,10 @@ openerp.account = function (instance) {
self.do_search(self.last_domain, self.last_context, self.last_group_by);
});
},
+ do_select: function (ids, records) {
+ this.trigger('record_selected')
+ this._super.apply(this, arguments);
+ },
});
};
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 4df0a8a22b2..9dd37afa3d6 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -10,7 +10,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_crm_meeting_read
@@ -28,7 +28,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_crm_meeting_unread
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 043630afc48..407d38dacd7 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -38,7 +38,7 @@ openerp.base_import = function (instance) {
// if true, the 'Import', 'Export', etc... buttons will be shown
instance.web.ListView.prototype.defaults.import_enabled = true;
instance.web.ListView.include({
- on_loaded: function () {
+ load_list: function () {
var self = this;
var add_button = false;
if (!this.$buttons) {
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index cee80eb0836..a0dce6a7ea9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -9,7 +9,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_crm_lead_unread
@@ -27,7 +27,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_crm_lead_read
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c610913febf..7f18f8d16e4 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -9,7 +9,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_crm_phonecall_unread
@@ -27,7 +27,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_crm_phonecall_read
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 61dc554d7ce..b36816f1770 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -64,7 +64,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_event_event_unread
@@ -82,7 +82,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_event_event_read
@@ -384,7 +384,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_event_registration_unread
@@ -402,7 +402,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_event_registration_read
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6e3c9b2d083..1808e216906 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,7 +8,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_holidays_unread
@@ -26,7 +26,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_holidays_read
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d6d04c1b969..12c552e7a6d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,7 +42,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_project_unread
@@ -60,7 +60,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_project_read
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 47a527a010d..3f0e439cfba 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -1055,8 +1055,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
this.pos.barcode_reader.disconnect();
return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
_.bind(function(res) {
- return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
- var action = result.result;
+ return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(action) {
action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
//self.destroy();
this.do_action(action);
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 249fb3e7b18..d7aaee96f2f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -26,7 +26,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_project_unread
@@ -44,7 +44,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_project_read
@@ -135,6 +135,7 @@
+
@@ -144,7 +145,7 @@
-
+
@@ -340,7 +341,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_project_task_unread
@@ -358,7 +359,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_project_task_read
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4cd9e2c19ff..818d4e6f556 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -11,7 +11,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_project_issue_unread
@@ -29,7 +29,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_project_issue_read
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 12fac7802c6..c6513e75942 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -46,12 +46,15 @@ class project_project(osv.osv):
def open_timesheets(self, cr, uid, ids, context=None):
""" open Timesheets view """
+ mod_obj = self.pool.get('ir.model.data')
+ act_obj = self.pool.get('ir.actions.act_window')
+
project = self.browse(cr, uid, ids[0], context)
view_context = {
'search_default_account_id': [project.analytic_account_id.id],
'default_account_id': project.analytic_account_id.id,
}
- help = _("""Record your timesheets for the project '%s'.
""")
+ help = _("""Record your timesheets for the project '%s'.
""") % (project.name,)
try:
if project.to_invoice and project.partner_id:
help+= _("""Timesheets on this project may be invoiced to %s, according to the terms defined in the contract.
""" ) % (project.partner_id.name,)
@@ -59,16 +62,13 @@ class project_project(osv.osv):
# if the user do not have access rights on the partner
pass
- return {
- 'type': 'ir.actions.act_window',
- 'name': _('Timesheets'),
- 'res_model': 'hr.analytic.timesheet',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'context': view_context,
- 'nodestroy': True,
- 'help': help
- }
+ res = mod_obj.get_object_reference(cr, uid, 'hr_timesheet', 'act_hr_timesheet_line_evry1_all_form')
+ id = res and res[1] or False
+ result = act_obj.read(cr, uid, [id], context=context)[0]
+ result['name'] = _('Timesheets')
+ result['context'] = view_context
+ result['help'] = help
+ return result
project_project()
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4d273d90b32..e0eab3dd4d0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -139,7 +139,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_purchase_order_unread
@@ -157,7 +157,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_purchase_order_read
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 37323bfeb22..17be961f17d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -73,7 +73,7 @@
ir.actions.server
code
- self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
action_sale_order_unread
@@ -91,7 +91,7 @@
ir.actions.server
code
- self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+ self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
action_sale_order_read