Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
[FIX]sale_stock: do not raise if not able to find any warehouse (for the get default warehouse), it can prevent the user of doing anything (if he does an upgrade of sale_stock module while having no warehouse set, the user will not be able to sign in in his instance again).
[FIX]portal_sale: add the lang to the email templates (sale.order and account.invoice), for the email to be translated in the customer language (as this is the case for regular email templates from sale and account modules-
Launchpad automatic translations update.
[FIX] im_livechat: many2one channel_id of im_session to the right model.

In im_session model, field channel_id was a many2one to im_user, or, obviously, this should be a many2one to im_livechat.channel
Well, obviously, this is a copy/paste error (or distraction, your choice!). This fix should normally not be pushed on a stable branch (like the current one, saas-2), but considering the severity of the problem, and the few changes in database (alter foreign key only), this is acceptable. Why such a big mistake has not been seen earlier ? Do you even test or read back what you write ?
[FIX] mail: reset alias when copying users
[FIX] auth_signup: set an alias for the template user
[MERGE] forward port of branch 7.0 up to revid 9673 launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
[MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy