Skip to content

Commit

Permalink
Merge remote-tracking branch 'odoo/9.0' into 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Mar 21, 2017
2 parents bed2959 + 8ec8194 commit befb342
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion addons/account/models/account_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def _compute_payments(self):
default=lambda self: self.env.user)
fiscal_position_id = fields.Many2one('account.fiscal.position', string='Fiscal Position', oldname='fiscal_position',
readonly=True, states={'draft': [('readonly', False)]})
commercial_partner_id = fields.Many2one('res.partner', string='Commercial Entity',
commercial_partner_id = fields.Many2one('res.partner', string='Commercial Entity', compute_sudo=True,
related='partner_id.commercial_partner_id', store=True, readonly=True,
help="The commercial entity that will be used on Journal Entries for this invoice")

Expand Down
2 changes: 1 addition & 1 deletion addons/hr_expense/models/hr_expense.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def _move_line_get(self):
# Calculate tax lines and adjust base line
taxes = expense.tax_ids.compute_all(expense.unit_amount, expense.currency_id, expense.quantity, expense.product_id)
account_move[-1]['price'] = taxes['total_excluded']
account_move[-1]['tax_ids'] = expense.tax_ids.ids
account_move[-1]['tax_ids'] = [(6, 0, expense.tax_ids.ids)]
for tax in taxes['taxes']:
account_move.append({
'type': 'tax',
Expand Down
3 changes: 2 additions & 1 deletion addons/mass_mailing/static/src/js/mass_mailing_editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ snippets_editor.Class.include({
var theme = ($("#o_left_bar .o_panel_body > div:not(.hidden)").attr("class") || "").replace(/^\s*|\s*o_mail_block[^\s]+\s*|\s*oe_snippet\s*|\s*ui-draggable\s*|\s*$/g, '');
var $theme = $("#editable_area [data-snippet-theme]").removeAttr("data-snippet-theme").removeData("snippet-theme");
$editable.children().first().attr("data-snippet-theme", theme);
$editable.find(":not(br):hidden").remove();
// before jQuery 3, google chrome needs the `:not(:has(:visible))` part
$editable.find(":not(br):hidden:not(:has(:visible))").remove();
},
});

Expand Down

0 comments on commit befb342

Please sign in to comment.