[MERGE] trunk-bug-1012470-rmu, improve procurements ordering (use 'priority desc,date_planned' instead of 'priority,date_planned desc')
lp bug: https://launchpad.net/bugs/1012470 fixed bzr revid: abo@openerp.com-20120911151544-bwaks9lkmg9v0td5
This commit is contained in:
@@ -80,7 +80,7 @@ class procurement_order(osv.osv):
|
||||
"""
|
||||
_name = "procurement.order"
|
||||
_description = "Procurement"
|
||||
_order = 'priority,date_planned desc'
|
||||
_order = 'priority desc,date_planned'
|
||||
_inherit = ['mail.thread']
|
||||
_log_create = False
|
||||
_columns = {
|
||||
@@ -319,13 +319,13 @@ class procurement_order(osv.osv):
|
||||
if record.move_id and record.move_id.state == 'cancel':
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
#Initialize get_phantom_bom_id method as it is raising an error from yml of mrp_jit
|
||||
#when one install first mrp and after that, mrp_jit. get_phantom_bom_id defined in mrp module
|
||||
#which is not dependent for mrp_jit.
|
||||
def get_phantom_bom_id(self, cr, uid, ids, context=None):
|
||||
return False
|
||||
|
||||
|
||||
def action_confirm(self, cr, uid, ids, context=None):
|
||||
""" Confirms procurement and writes exception message if any.
|
||||
@return: True
|
||||
|
||||
Reference in New Issue
Block a user