pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-14 up to 9b2d3b19a6

Browse Source
This commit is contained in:
Christophe Simonis
2018-02-09 12:40:16 +01:00
parent 047796817c 9b2d3b19a6
commit 6d0f63ec4e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/chart_template.py
+1 -1
View File
@@ -727,7 +727,7 @@ class WizardMultiChartsAccounts(models.TransientModel):
if company_id: if company_id:
company = self.env['res.company'].browse(company_id) company = self.env['res.company'].browse(company_id)
currency_id = company.on_change_country(company.country_id.id)['value']['currency_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)]) chart_templates = account_chart_template.search([('visible', '=', True)])
if chart_templates: if chart_templates:
addons/calendar/models/calendar.py
+1 -1
View File
@@ -1419,7 +1419,7 @@ class Meeting(models.Model):
partners_to_notify = meeting.partner_ids.ids partners_to_notify = meeting.partner_ids.ids
event_attendees_changes = attendees_create and real_ids and attendees_create[real_ids[0]] event_attendees_changes = attendees_create and real_ids and attendees_create[real_ids[0]]
if event_attendees_changes: 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) self.env['calendar.alarm_manager'].notify_next_alarm(partners_to_notify)
if (values.get('start_date') or values.get('start_datetime') or if (values.get('start_date') or values.get('start_datetime') or
odoo/addons/base/res/res_company.py
+2 -2
View File
@@ -246,8 +246,8 @@ class Company(models.Model):
self.ensure_one() self.ensure_one()
currency_id = self._get_user_currency() currency_id = self._get_user_currency()
if country_id: if country_id:
currency_id = self.env['res.country'].browse(country_id).currency_id.id currency_id = self.env['res.country'].browse(country_id).currency_id
return {'value': {'currency_id': currency_id}} return {'value': {'currency_id': currency_id.id}}
@api.onchange('country_id') @api.onchange('country_id')
def _onchange_country_id_wrapper(self): def _onchange_country_id_wrapper(self):