Unifield Web

Merge lp:~julie-w/unifield-web/US-3669 into lp:unifield-web

  1. US-3669
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4917
Proposed branch: lp:~julie-w/unifield-web/US-3669
Merge into: lp:unifield-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/openerp/widgets/form/_form.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-web/US-3669
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+345653@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 'addons/openerp/widgets/form/_form.py'
2--- addons/openerp/widgets/form/_form.py 2018-03-16 11:04:11 +0000
3+++ addons/openerp/widgets/form/_form.py 2018-05-16 09:13:41 +0000
4@@ -921,7 +921,7 @@
5 attrs['force_readonly'] = True
6 attrs['ro_by_trans'] = True
7
8- if self.noteditable:
9+ if self.noteditable and not attrs.get('force_editable'):
10 attrs['readonly'] = True
11 attrs['force_readonly'] = True
12 if 'attrs' in attrs and attrs['attrs'] and 'readonly' in attrs['attrs']:

Subscribers

People subscribed via source and target branches