OpenERP

Merge proposals dependent on lp://qastaging/~domsense/openerp/stock_cancel_improvements

  1. stock_cancel_improvements
  2. Dependent merge proposals

lp://qastaging/~domsense/openerp/stock_cancel_improvements has no merge proposals.