Unifield Server

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

  1. US-5003
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5087
Proposed branch: lp:~julie-w/unifield-server/US-5003
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/account_override/account.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5003
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+354239@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account_override/account.py'
2--- bin/addons/account_override/account.py 2018-08-17 08:28:25 +0000
3+++ bin/addons/account_override/account.py 2018-09-04 12:11:57 +0000
4@@ -808,7 +808,7 @@
5 domain="[('state', '=', 'draft')]", hide_default_menu=True),
6 'journal_id': fields.many2one('account.journal', 'Journal',
7 required=True, states={'posted':[('readonly',True)]},
8- domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj', 'system']), ('instance_filter', '=', True)]",
9+ domain="[('type', 'not in', ['accrual', 'hq', 'inkind', 'cur_adj', 'system', 'extra']), ('instance_filter', '=', True)]",
10 hide_default_menu=True),
11 'document_date': fields.date('Document Date', size=255, required=True, help="Used for manual journal entries"),
12 'journal_type': fields.related('journal_id', 'type', type='selection', selection=_journal_type_get, string="Journal Type", \

Subscribers

People subscribed via source and target branches