Merge proposals dependent on lp://staging/~openerp-community/openobject-addons/fix-account-6-1-tax-computation-method

1. fix-account-6-1-tax-computation-method
2. Dependent merge proposals