From ed07bca432d9b7fe73ddf7f9a16001452d5d3d83 Mon Sep 17 00:00:00 2001 From: Jacques-Etienne Baudoux Date: Wed, 5 Jun 2013 09:33:11 +0200 Subject: [PATCH] [FIX]purchase_requisition: tree options is not standard, change approach to OpenERP standard bzr revid: je@bcim.be-20130605073311-ae1u2jdjqvu34c66 --- .../purchase_requisition_view.xml | 12 +++------- .../static/src/js/web_addons.js | 23 ++++++++----------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index 437c32ba172..10286a3a41b 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -217,8 +217,9 @@ purchase.order.line.tree.tender purchase.order.line + - + @@ -243,16 +244,9 @@ {"search_default_groupby_product" : True,} form tree + - - - - tree - - - - diff --git a/addons/purchase_requisition/static/src/js/web_addons.js b/addons/purchase_requisition/static/src/js/web_addons.js index dc5efa27755..693df43c751 100644 --- a/addons/purchase_requisition/static/src/js/web_addons.js +++ b/addons/purchase_requisition/static/src/js/web_addons.js @@ -1,22 +1,19 @@ openerp.purchase_requisition = function(instance) { - var QWeb = instance.web.qweb, - _t = instance.web._t; + _t = instance.web._t; - instance.web.ListView.include({ + instance.web.purchase_requisition = instance.web.purchase_requisition || {}; + + instance.web.views.add('tree_purchase_order_line_compare', 'instance.web.purchase_requisition.CompareListView'); + instance.web.purchase_requisition.CompareListView = instance.web.ListView.extend({ init: function() { var self = this; this._super.apply(this, arguments); this.on('list_view_loaded', this, function() { - if (!!self.fields_view.arch.attrs.options) { - _.extend(self.options, py.eval(self.fields_view.arch.attrs.options)); - } - if (!!self.options.generate_po) { - if(self.__parentedParent.$el.find('.oe_generate_po').length == 0){ - var button = $("") - .click(this.proxy('generate_purchase_order')); - self.__parentedParent.$el.find('.oe_list_buttons').append(button); - } + if(self.__parentedParent.$el.find('.oe_generate_po').length == 0){ + var button = $("") + .click(this.proxy('generate_purchase_order')); + self.__parentedParent.$el.find('.oe_list_buttons').append(button); } }); }, @@ -27,4 +24,4 @@ openerp.purchase_requisition = function(instance) { }); }, }); -} \ No newline at end of file +}