[MERGE] forward port branch 10.0 up to 36ba37a7a1c

2 files changed, 2 insertions, 2 deletions

diff --git a/odoo/addons/base/res/res_currency.py b/odoo/addons/base/res/res_currency.py
index 0ee76e0567c..c250d8e374d 100644
--- a/odoo/addons/base/res/res_currency.py
+++ b/odoo/addons/base/res/res_currency.py
@@ -206,7 +206,7 @@ class CurrencyRate(models.Model):
 
     name = fields.Datetime(string='Date', required=True, index=True,
                            default=lambda self: fields.Date.today() + ' 00:00:00')
-    rate = fields.Float(digits=(12, 6), help='The rate of the currency to the currency of rate 1')
+    rate = fields.Float(digits=(12, 6), default=1.0, help='The rate of the currency to the currency of rate 1')
     currency_id = fields.Many2one('res.currency', string='Currency', readonly=True)
     company_id = fields.Many2one('res.company', string='Company',
                                  default=lambda self: self.env.user.company_id)
diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/res/res_partner.py
index 46b1cd44398..6c8aa0e40a4 100644
--- a/odoo/addons/base/res/res_partner.py
+++ b/odoo/addons/base/res/res_partner.py
@@ -425,7 +425,7 @@ class Partner(models.Model):
         as if they were related fields """
         commercial_partner = self.commercial_partner_id
         if commercial_partner != self:
-            sync_vals = commercial_partner._update_fields_values(self._commercial_fields())
+            sync_vals = commercial_partner.with_prefetch()._update_fields_values(self._commercial_fields())
             self.write(sync_vals)
 
     @api.multi