Merge proposals dependent on lp://qastaging/~openerp-chinese-team/openobject-addons/7.0-mrp-stock-picking-reference-fix

1. 7.0-mrp-stock-picking-reference-fix
2. Dependent merge proposals