odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

fixes 

bzr revid: hda@tinyerp.com-20091007112918-z4b0j7jrv7ov0ys6
This commit is contained in:
HDA (OpenERP) 2009-10-07 16:59:18 +05:30
parent 5c666b2ad9
commit b652bce8fd
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/membership/membership.py
View File

@ -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'

1
addons/mrp_operations/mrp_operations.py
View File

@ -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'),