Merge proposals dependent on lp://qastaging/~openerp-chinese-team/openerp-china/joshua-bug-fix

1. joshua-bug-fix
2. Dependent merge proposals