Merge proposals dependent on lp://staging/~joao-gama/openerp-canada/6.1-bug-1087847-joao-gama

1. 6.1-bug-1087847-joao-gama
2. Dependent merge proposals