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
921
                    attrs['force_readonly'] = True
921
                    attrs['force_readonly'] = True
6
922
                    attrs['ro_by_trans'] = True
922
                    attrs['ro_by_trans'] = True
7
923
923
9
924
            if self.noteditable:
924
            if self.noteditable and not attrs.get('force_editable'):
10
925
                attrs['readonly'] = True
925
                attrs['readonly'] = True
11
926
                attrs['force_readonly'] = True
926
                attrs['force_readonly'] = True
12
927
                if 'attrs' in attrs and attrs['attrs'] and 'readonly' in attrs['attrs']:
927
                if 'attrs' in attrs and attrs['attrs'] and 'readonly' in attrs['attrs']:
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
UniField Dev Team		2018-05-16	Pending
Review via email: mp+345653@code.launchpad.net
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	921	attrs['force_readonly'] = True	921	attrs['force_readonly'] = True
6	922	attrs['ro_by_trans'] = True	922	attrs['ro_by_trans'] = True
7	923		923
9	924	if self.noteditable:	924	if self.noteditable and not attrs.get('force_editable'):
10	925	attrs['readonly'] = True	925	attrs['readonly'] = True
11	926	attrs['force_readonly'] = True	926	attrs['force_readonly'] = True
12	927	if 'attrs' in attrs and attrs['attrs'] and 'readonly' in attrs['attrs']:	927	if 'attrs' in attrs and attrs['attrs'] and 'readonly' in attrs['attrs']: