diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-26 11:15:11 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-26 11:15:11 +0200 |
| commit | 459ea4ab4d02e69942997398dbe4b2bf7aa02d68 (patch) | |
| tree | 1c65f2ac979dc8c583c44c87ab8e6e30b52b962c | |
| parent | 09a686fa294caaba241c2b7f2dcb7de707a2b87b (diff) | |
| parent | 2b2be3caa43bf2d0924e5742c6e3330477644971 (diff) | |
[MERGE] forward port branch 9.0 up to 2b2be3caa43
| -rw-r--r-- | addons/account/report/account_balance.py | 4 | ||||
| -rw-r--r-- | addons/crm/crm_lead.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 4422ddd5db3..96b8fb6adb5 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -50,7 +50,9 @@ class ReportTrialBalance(models.AbstractModel): res['balance'] = account_result[account.id].get('balance') if display_account == 'all': account_res.append(res) - if display_account in ['movement', 'not_zero'] and not currency.is_zero(res['balance']): + if display_account == 'not_zero' and not currency.is_zero(res['balance']): + account_res.append(res) + if display_account == 'movement' and (not currency.is_zero(res['debit']) or not currency.is_zero(res['credit'])): account_res.append(res) return account_res diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index afaad2934b3..869762d66b1 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -818,6 +818,9 @@ class crm_lead(FormatAddress, osv.osv): context['default_team_id'] = vals.get('team_id') if vals.get('user_id') and 'date_open' not in vals: vals['date_open'] = fields.datetime.now() + if context.get('default_partner_id') and not vals.get('email_from'): + partner_id = self.pool['res.partner'].browse(cr, uid, context.get('default_partner_id')) + vals['email_from'] = partner_id.email # context: no_log, because subtype already handle this create_context = dict(context, mail_create_nolog=True) |