diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-23 18:25:03 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-23 18:25:03 +0100 |
| commit | 9a1d71ce95fd3c0476aee358b37e29fd7cd8edc7 (patch) | |
| tree | 980ae7be433de8bc94511ad2c39ca253a337b2cb /addons | |
| parent | 9cfd4a5c07ed4d7b2245efc637552ca598b5061c (diff) | |
| parent | d8e45489cd832f3038b75697adcda0418c639708 (diff) | |
[MERGE] forward port branch saas-14 up to d8e45489cd8
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py | 5 | ||||
| -rw-r--r-- | addons/mail/models/mail_channel.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py index 4b65828897c..f970d38ea32 100644 --- a/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py @@ -68,9 +68,8 @@ class HrTimesheetSheet(models.Model): '\n* The \'Waiting Approval\' status is used to confirm the timesheet by user. ' '\n* The \'Approved\' status is used when the users timesheet is accepted by his/her senior.') account_ids = fields.One2many('hr_timesheet_sheet.sheet.account', 'sheet_id', string='Analytic accounts', readonly=True) - company_id = fields.Many2one('res.company', string='Company') - department_id = fields.Many2one('hr.department', string='Department', - default=lambda self: self.env['res.company']._company_default_get()) + company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env['res.company']._company_default_get()) + department_id = fields.Many2one('hr.department', string='Department') @api.constrains('date_to', 'date_from', 'employee_id') def _check_sheet_date(self, forced_user_id=False): diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py index 77d71993caa..ebd923ab8f8 100644 --- a/addons/mail/models/mail_channel.py +++ b/addons/mail/models/mail_channel.py @@ -49,7 +49,7 @@ class Channel(models.Model): ('channel', 'Channel')], 'Channel Type', default='channel') description = fields.Text('Description') - uuid = fields.Char('UUID', size=50, index=True, default=lambda self: '%s' % uuid.uuid4()) + uuid = fields.Char('UUID', size=50, index=True, default=lambda self: '%s' % uuid.uuid4(), copy=False) email_send = fields.Boolean('Send messages by email', default=False) # multi users channel channel_last_seen_partner_ids = fields.One2many('mail.channel.partner', 'channel_id', string='Last Seen') |