[MERGE] forward port branch 10.0 up to 2b7c525982f

2 files changed, 6 insertions, 1 deletions

diff --git a/addons/account_asset/models/account_asset.py b/addons/account_asset/models/account_asset.py
index 52d2c48a0d9..2663bff2d00 100644
--- a/addons/account_asset/models/account_asset.py
+++ b/addons/account_asset/models/account_asset.py
@@ -333,6 +333,8 @@ class AccountAssetAsset(models.Model):
                 'target': 'current',
                 'res_id': move_ids[0],
             }
+        # Fallback, as if we just clicked on the smartbutton
+        return self.open_entries()
 
     @api.multi
     def set_to_draft(self):
diff --git a/odoo/service/db.py b/odoo/service/db.py
index a90365c7201..2696905c170 100644
--- a/odoo/service/db.py
+++ b/odoo/service/db.py
@@ -58,7 +58,10 @@ def _initialize_db(id, db_name, demo, lang, user_password, login='admin', countr
             if country_code:
                 countries = env['res.country'].search([('code', 'ilike', country_code)])
                 if countries:
-                    env['res.company'].browse(1).country_id = countries[0]
+                    comp_local = {'country_id': countries[0].id}
+                    if countries[0].currency_id:
+                        comp_local['currency_id'] = countries[0].currency_id.id
+                    env['res.company'].browse(1).write(comp_local)
 
             # update admin's password and lang and login
             values = {'password': user_password, 'lang': lang}