From be32270f9e2b5c126304dff7ee2672154c6ca812 Mon Sep 17 00:00:00 2001 From: "Ravish Murari (OpenERP)" Date: Thu, 12 Jul 2012 12:55:33 +0530 Subject: [PATCH 1/2] [FIX] priority sort in descending order lp bug: https://launchpad.net/bugs/1012470 fixed bzr revid: rmu@tinyerp.com-20120712072533-lauip67jq6y3oe2n --- addons/procurement/procurement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 1c83711abf7..e76f6216155 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -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 = { From b0e6046f73d616fb8b940773afd15319c9b78cce Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Tue, 11 Sep 2012 16:01:33 +0200 Subject: [PATCH 2/2] [IMP] whitespaces bzr revid: abo@openerp.com-20120911140133-usu2dsg2xjiythvj --- addons/procurement/procurement.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index e76f6216155..c5ba1ba7ce5 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -80,7 +80,7 @@ class procurement_order(osv.osv): """ _name = "procurement.order" _description = "Procurement" - _order ='priority desc,date_planned' + _order = 'priority desc,date_planned' _inherit = ['mail.thread'] _log_create = False _columns = { @@ -166,7 +166,7 @@ class procurement_order(osv.osv): """ return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids, context=context)) - #This Function is create to avoid a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined' + #This Function is create to avoid a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined' def check_move(self, cr, uid, ids, context=None): pass @@ -277,7 +277,7 @@ class procurement_order(osv.osv): if not res: return False return True - + def check_buy(self, cr, uid, ids): """ Checks product type. @return: True or Product Id. @@ -359,7 +359,7 @@ class procurement_order(osv.osv): message = _('From stock: products assigned.') self.write(cr, uid, ids, {'state': 'running', 'message': message}, context=context) - self.message_append_note(cr, uid, ids, body=message, context=context) + self.message_append_note(cr, uid, ids, body=message, context=context) self.running_send_note(cr, uid, ids, context=context) return True @@ -392,7 +392,7 @@ class procurement_order(osv.osv): if message: message = _("Procurement '%s' is in exception: ") % (procurement.name) + message cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) - self.message_append_note(cr, uid, [procurement.id], body=message, context=context) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) return ok def action_produce_assign_service(self, cr, uid, ids, context=None): @@ -607,7 +607,7 @@ class stock_warehouse_orderpoint(osv.osv): v = {'product_uom': prod.uom_id.id} return {'value': v} return {} - + def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} @@ -615,7 +615,7 @@ class stock_warehouse_orderpoint(osv.osv): 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint') or '', }) return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context) - + stock_warehouse_orderpoint() class product_product(osv.osv):