diff --git a/addons/account/account.py b/addons/account/account.py
index 994e32e1e28..792e4c40912 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2056,6 +2056,8 @@ class account_tax(osv.osv):
                 amount = amount2
                 child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity)
                 res.extend(child_tax)
+                for child in child_tax:
+                    amount2 += child.get('amount', 0.0)
                 if tax.child_depend:
                     for r in res:
                         for name in ('base','ref_base'):
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 6abdab41b7c..fe64f42b2f6 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data noupdate="1">
         <record id="provider_openerp" model="auth.oauth.provider">
-            <field name="name">OpenERP.com Accounts</field>
-            <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
+            <field name="name">Odoo.com Accounts</field>
+            <field name="auth_endpoint">https://accounts.odoo.com/oauth2/auth</field>
             <field name="scope">userinfo</field>
-            <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
+            <field name="validation_endpoint">https://accounts.odoo.com/oauth2/tokeninfo</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial openerp</field>
-            <field name="body">Log in with OpenERP.com</field>
+            <field name="body">Log in with Odoo.com</field>
             <field name="enabled" eval="True"/>
         </record>
         <record id="provider_facebook" model="auth.oauth.provider">