diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 4ece8b537d4..c84b311f307 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -528,40 +528,25 @@ class account_analytic_account_summary_user(osv.osv): def init(self, cr): tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user') - cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \ - 'SELECT ' \ - '(u.account_id * u.max_user) + u."user" AS id, ' \ - 'u.account_id AS account_id, ' \ - 'u."user" AS "user", ' \ - 'COALESCE(SUM(l.unit_amount), 0.0) AS unit_amount ' \ - 'FROM ' \ - '(SELECT ' \ - 'a.id AS account_id, ' \ - 'u1.id AS "user", ' \ - 'MAX(u2.id) AS max_user ' \ - 'FROM ' \ - 'res_users AS u1, ' \ - 'res_users AS u2, ' \ - 'account_analytic_account AS a ' \ - 'GROUP BY u1.id, a.id ' \ - ') AS u ' \ - 'LEFT JOIN ' \ - '(SELECT ' \ - 'l.account_id AS account_id, ' \ - 'l.user_id AS "user", ' \ - 'SUM(l.unit_amount) AS unit_amount ' \ - 'FROM account_analytic_line AS l, ' \ - 'account_analytic_journal AS j ' \ - 'WHERE (j.type = \'general\') and (j.id=l.journal_id) ' \ - 'GROUP BY l.account_id, l.user_id ' \ - ') AS l ' - 'ON (' \ - 'u.account_id = l.account_id ' \ - 'AND u."user" = l."user"' \ - ') ' \ - 'GROUP BY u."user", u.account_id, u.max_user' \ - ')') - + cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS ( + with mu as + (select max(id) as max_user from res_users) + , lu AS + (SELECT + l.account_id AS account_id, + coalesce(l.user_id, 0) AS user_id, + SUM(l.unit_amount) AS unit_amount + FROM account_analytic_line AS l, + account_analytic_journal AS j + WHERE (j.type = 'general' ) and (j.id=l.journal_id) + GROUP BY l.account_id, l.user_id + ) + select (lu.account_id * mu.max_user) + lu.user_id as id, + lu.account_id as account_id, + lu.user_id as "user", + unit_amount + from lu, mu)''') + account_analytic_account_summary_user() class account_analytic_account_summary_month(osv.osv): diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js index c4dc412dda1..15c03a6ce63 100644 --- a/addons/anonymous/static/src/js/anonymous.js +++ b/addons/anonymous/static/src/js/anonymous.js @@ -1,29 +1,20 @@ openerp.anonymous = function(instance) { - instance.web.client_actions.add("login", "instance.web.Login"); - - instance.web.WebClient.include({ - show_login: function() { - var self = this, _super = this._super; - this.login.load_db_list().then(function() { - var dblist = self.login._db_list; + instance.web.Login.include({ + start: function() { + var self = this; + return $.when(this._super()).pipe(function() { + var dblist = self._db_list; if (dblist && dblist.length === 1) { - self.login.remember_credentials = false; + self.remember_credentials = false; // XXX get login/pass from server (via a rpc call) ? - self.login.do_login(dblist[0], 'anonymous', 'anonymous').fail(function() { - _super.apply(self, []); - }); - } else { - _super.apply(self, []); + return self.do_login(dblist[0], 'anonymous', 'anonymous') } + }); }, - restart: function() { - return this.start(); - } }); - instance.web.UserMenu.include({ init: function(parent) { this._super(parent); @@ -39,8 +30,8 @@ openerp.anonymous = function(instance) { var p = self.getParent(); var am = p.action_manager; p.$element.find('.oe_leftbar').hide(); - am.do_action({type:'ir.actions.client', tag:'login'}); - am.inner_widget.on('login', p, p.restart); + am.do_action({type:'ir.actions.client', tag:'login', target: 'new'}); + am.dialog_widget.on('login', p, p.restart); }); } }); diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index c58c27a9959..77244addd9f 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -73,7 +73,7 @@
-