From: Géry Debongnie Date: Tue, 7 Oct 2014 14:42:32 +0000 (+0200) Subject: [IMP] various code cleanups X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=f4774f25ad3c7e43f2485c2683c90f3563539078;p=odoo%2Fodoo.git [IMP] various code cleanups remove some old cruft --- diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml index 0a41c7c0..395e3aa 100644 --- a/addons/email_template/res_partner_view.xml +++ b/addons/email_template/res_partner_view.xml @@ -12,20 +12,6 @@ - - res.partner.opt_out.search - res.partner - - - - - - - - - diff --git a/addons/sales_team/sales_team.py b/addons/sales_team/sales_team.py index e18cc32..def12c2 100644 --- a/addons/sales_team/sales_team.py +++ b/addons/sales_team/sales_team.py @@ -65,7 +65,7 @@ class crm_case_section(osv.osv): _columns = { 'name': fields.char('Sales Team', size=64, required=True, translate=True), - 'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True), + 'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True, string="Full Name"), 'code': fields.char('Code', size=8), 'active': fields.boolean('Active', help="If the active field is set to "\ "true, it will allow you to hide the sales team without removing it."), diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 29d345b..93de734 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -7,9 +7,6 @@ openerp.web.search = {}; var QWeb = instance.web.qweb, _t = instance.web._t, _lt = instance.web._lt; -_.mixin({ - sum: function (obj) { return _.reduce(obj, function (a, b) { return a + b; }, 0); } -}); /** @namespace */ var my = instance.web.search = {}; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 25fa478..b12e608 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -85,8 +85,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM * @param {instance.web.Session} session the current openerp session * @param {instance.web.DataSet} dataset the dataset this view will work with * @param {String} view_id the identifier of the OpenERP view object - * @param {Object} options - * - resize_textareas : [true|false|max_height] * * @property {instance.web.Registry} registry=instance.web.form.widgets widgets registry for this form view instance */ @@ -3972,7 +3970,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ disable_utility_classes: true, init: function(field_manager, node) { this._super(field_manager, node); - lazy_build_o2m_kanban_view(); this.is_loaded = $.Deferred(); this.initial_is_loaded = this.is_loaded; this.form_last_update = $.Deferred(); @@ -4270,7 +4267,6 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ this.registry = instance.web.views.extend({ list: 'instance.web.form.One2ManyListView', form: 'instance.web.form.One2ManyFormView', - kanban: 'instance.web.form.One2ManyKanbanView', }); this.__ignore_blur = false; }, @@ -4540,13 +4536,6 @@ instance.web.form.One2ManyFormView = instance.web.FormView.extend({ } }); -var lazy_build_o2m_kanban_view = function() { - if (! instance.web_kanban || instance.web.form.One2ManyKanbanView) - return; - instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({ - }); -}; - instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, { template: "FieldMany2ManyTags", tag_template: "FieldMany2ManyTag", @@ -5139,8 +5128,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ this.domain = domain || []; this.context = context || {}; this.options = options; - _.defaults(this.options, { - }); + _.defaults(this.options, {}); }, init_dataset: function() { var self = this; @@ -5356,8 +5344,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.new_object(); }); }); - }); - this.searchview.appendTo(this.$(".oe_popup_search")); + }); }, do_search: function(domains, contexts, groupbys) { var self = this;