diff options
| author | HDA (OpenERP) <hda@tinyerp.com> | 2009-10-07 16:59:18 +0530 |
|---|---|---|
| committer | HDA (OpenERP) <hda@tinyerp.com> | 2009-10-07 16:59:18 +0530 |
| commit | b652bce8fdbc49b7db084b35996fcd13f6431efa (patch) | |
| tree | 4fa4573a68e5fd65140217a6d6221c6185ddad59 | |
| parent | 5c666b2ad930a3dc70a909fc2d1e0afb2573037a (diff) | |
fixes
bzr revid: hda@tinyerp.com-20091007112918-z4b0j7jrv7ov0ys6
| -rw-r--r-- | addons/membership/membership.py | 4 | ||||
| -rw-r--r-- | addons/mrp_operations/mrp_operations.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/membership/membership.py b/addons/membership/membership.py index a0d45169278..71e7f6e2e88 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 19e9c3ebaf7..8d01b87e7a6 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'), |