[MERGE] forward port branch 10.0 up to df3fb9f85a
This commit is contained in:
@@ -727,7 +727,7 @@ class WizardMultiChartsAccounts(models.TransientModel):
|
||||
if company_id:
|
||||
company = self.env['res.company'].browse(company_id)
|
||||
currency_id = company.on_change_country(company.country_id.id)['value']['currency_id']
|
||||
res.update({'currency_id': currency_id.id})
|
||||
res.update({'currency_id': currency_id})
|
||||
|
||||
chart_templates = account_chart_template.search([('visible', '=', True)])
|
||||
if chart_templates:
|
||||
|
||||
@@ -1418,7 +1418,7 @@ class Meeting(models.Model):
|
||||
partners_to_notify = meeting.partner_ids.ids
|
||||
event_attendees_changes = attendees_create and real_ids and attendees_create[real_ids[0]]
|
||||
if event_attendees_changes:
|
||||
partners_to_notify.append(event_attendees_changes['removed_partners'].ids)
|
||||
partners_to_notify.extend(event_attendees_changes['removed_partners'].ids)
|
||||
self.env['calendar.alarm_manager'].notify_next_alarm(partners_to_notify)
|
||||
|
||||
if (values.get('start_date') or values.get('start_datetime') or
|
||||
|
||||
@@ -241,8 +241,8 @@ class Company(models.Model):
|
||||
self.ensure_one()
|
||||
currency_id = self._get_user_currency()
|
||||
if country_id:
|
||||
currency_id = self.env['res.country'].browse(country_id).currency_id.id
|
||||
return {'value': {'currency_id': currency_id}}
|
||||
currency_id = self.env['res.country'].browse(country_id).currency_id
|
||||
return {'value': {'currency_id': currency_id.id}}
|
||||
|
||||
@api.onchange('country_id')
|
||||
def _onchange_country_id_wrapper(self):
|
||||
|
||||
Reference in New Issue
Block a user