Merge proposals dependent on lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix

lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix has no merge proposals.