diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 563092c74a9..d5e11e1d5b3 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -475,7 +475,9 @@ class hr_payslip(osv.osv): def _sum_salary_rule_category(localdict, category, amount): if category.parent_id: localdict = _sum_salary_rule_category(localdict, category.parent_id, amount) - localdict['categories'].dict[category.code] = category.code in localdict['categories'].dict and localdict['categories'].dict[category.code] + amount or amount + if category.code in localdict['categories'].dict: + amount += localdict['categories'].dict[category.code] + localdict['categories'].dict[category.code] = amount return localdict class BrowsableObject(object): diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index e3cc6e0e8d4..c2b5a005c5a 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -961,13 +961,7 @@ openerp.web_calendar = function(instance) { this.$input = $(); }, get_title: function () { - var parent = this.getParent(); - if (_.isUndefined(parent)) { - return _t("Create"); - } - var title = (_.isUndefined(parent.field_widget)) ? - (parent.string || parent.name) : - parent.field_widget.string || parent.field_widget.name || ''; + var title = (this.options.action)? this.options.action.name : ''; return _t("Create: ") + title; }, start: function () {