From: HDA (OpenERP) <hda@tinyerp.com>
Date: Wed, 7 Oct 2009 11:29:18 +0000 (+0530)
Subject: fixes
X-Git-Tag: 6.0.0-rc1-addons~2145
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b652bce8fdbc49b7db084b35996fcd13f6431efa;p=odoo%2Fodoo.git

fixes

bzr revid: hda@tinyerp.com-20091007112918-z4b0j7jrv7ov0ys6
---

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index a0d4516..71e7f6e 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -424,7 +424,7 @@ product_template()
 
 class Product(osv.osv):
 
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if ('product' in context) and (context['product']=='membership_product'):
             model_data_ids_form = self.pool.get('ir.model.data').search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
             resource_id_form = self.pool.get('ir.model.data').read(cr,user,model_data_ids_form,fields=['res_id','name'])
@@ -435,7 +435,7 @@ class Product(osv.osv):
                 view_id = dict_model['membership_products_form']
             else:
                 view_id = dict_model['membership_products_tree']
-        return super(Product,self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        return super(Product,self).fields_view_get(cr, user, view_id, view_type, context, toolbar, submenu)
 
     '''Product'''
     _inherit = 'product.product'
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 19e9c3e..8d01b87 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -68,7 +68,6 @@ class mrp_production_workcenter_line(osv.osv):
                     res[op.id] = op.date_planned
         return res
     _inherit = 'mrp.production.workcenter.line'
-    _order = "sequence, date_planned"
     _columns = {
        'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
        'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),