diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index f8c251ea5..149060448 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -1305,9 +1305,9 @@ class wizard_update_charts_accounts(orm.TransientModel):
                 'shortcut': account_template.shortcut,
                 'note': account_template.note,
                 'parent_id': (
-                    account_template.parent_id
-                    and account_template_mapping.get(p_id) or
-                    False
+                    account_template_mapping.get(p_id)
+                    if account_template.parent_id
+                    else False
                 ),
                 'tax_ids': [(6, 0, tax_ids)],
                 'company_id': wizard.company_id.id,
diff --git a/account_fiscal_position_vat_check/account_invoice.py b/account_fiscal_position_vat_check/account_invoice.py
index 95a0e031b..62a17a7d2 100644
--- a/account_fiscal_position_vat_check/account_invoice.py
+++ b/account_fiscal_position_vat_check/account_invoice.py
@@ -42,10 +42,10 @@ class account_invoice(models.Model):
         if required by the fiscal position'''
         for invoice in self:
             if (
-                    invoice.type in ('out_invoice', 'out_refund')
-                    and invoice.fiscal_position
-                    and invoice.fiscal_position.customer_must_have_vat
-                    and not invoice.partner_id.vat):
+                    invoice.type in ('out_invoice', 'out_refund') and
+                    invoice.fiscal_position and
+                    invoice.fiscal_position.customer_must_have_vat and
+                    not invoice.partner_id.vat):
                 if invoice.type == 'out_invoice':
                     type_label = _('a Customer Invoice')
                 else: