Merge lp:~julie-w/unifield-server/US-5003 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2018-08-17 08:28:25 +0000
+++ bin/addons/account_override/account.py	2018-09-04 12:11:57 +0000
@@ -808,7 +808,7 @@
                                      domain="[('state', '=', 'draft')]", hide_default_menu=True),
         'journal_id': fields.many2one('account.journal', 'Journal',
                                       required=True, states={'posted':[('readonly',True)]},
-                                      domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj', 'system']), ('instance_filter', '=', True)]",
+                                      domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj', 'system', 'extra']), ('instance_filter', '=', True)]",
                                       hide_default_menu=True),
         'document_date': fields.date('Document Date', size=255, required=True, help="Used for manual journal entries"),
         'journal_type': fields.related('journal_id', 'type', type='selection', selection=_journal_type_get, string="Journal Type", \