From c94ded86597d4d4791c72dead2d437867809ed06 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Fri, 27 Apr 2012 16:40:56 +0530 Subject: [PATCH] set order in stock and purchase bzr revid: apa@tinyerp.com-20120427111056-w9miufobwy56ipq7 --- addons/purchase/purchase.py | 5 +++-- addons/stock/stock.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 687221f371b..002be4aa055 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -148,8 +148,9 @@ class purchase_order(osv.osv): ('approved', 'Approved'), ('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), - ('done', 'Done'), - ('cancel', 'Cancelled') + ('cancel', 'Cancelled'), + ('done', 'Done') + ] _columns = { diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 087a9b4f166..a17bfd10b24 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1630,7 +1630,7 @@ class stock_move(osv.osv): 'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'), 'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}), 'note': fields.text('Notes'), - 'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, + 'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'),('cancel', 'Cancelled'),('done', 'Done')], 'State', readonly=True, select=True, help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\ \nThe state is \'Waiting\' if the move is waiting for another one.'), 'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),