Merge proposals dependent on lp://qastaging/~acespritech/openerp/stock_cancel

lp://qastaging/~acespritech/openerp/stock_cancel has no merge proposals.