Merge proposals dependent on lp://qastaging/~alhashash/openobject-addons/7.0-bug-1317455-check-show-amount-in-words

1. 7.0-bug-1317455-check-show-amount-in-words
2. Dependent merge proposals