[FIX] account: if tax is , total base is
applied only on the main tax and does not carry the child tax amount into base, it is compulsory to add child tax amount to tax base
becuase the next tax i.e. VAT is applied on total tax base amount
[MERGE] [FIX] account: when computing a tax with include_base_amount enabled, include the child tax amounts into the sum for the next tax
Launchpad automatic translations update.
[WIP] sitemap
[REM] debuggin stuff
Launchpad automatic translations update.
[FIX] auth_oauth: Replace OpenERP.com provider by Odoo.com provider
[FIX] point_of_sale: add product variant in the displayed name (opw 607456)
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10050 revid:dle@openerp.com-20140516110134-oadkw3xt5bhky781
[MERGE] upstream
[IMP] sitemap caches it's output in ir.attachment
[FIX] website_quote: message_post expects the attachments to be NOT in base64 format (opw 607477)
Launchpad automatic translations update.
Launchpad automatic translations update.
[REVERT] revid:jke@openerp.com-20140507120144-m177kqxa3fbfl37r: create_picking checks if the order is in state draft before doing anything. Writing the state 'paid' just before calling this method is then not a good idea
[FIX] marketing_campaign: server actions always return None or False, and the return value of method _process_wi_action should return True whatever what the server action returns

If the server actions returned None instead of False, the next activity was not triggered, while it should
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10054 revid:dle@openerp.com-20140519103020-bcqz4rssbqsvn9m7
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9460 revid:dle@openerp.com-20140519103942-do7uem4in0jfqzo2
[IMP] minor changes to sitemap
[IMP] store sitemaps in ir.attachments