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

Proposed by jftempo
Status: Merged
Merged at revision: 4935
Proposed branch: lp:~julie-w/unifield-web/US-4638
Merge into: lp:unifield-web
Diff against target: 24 lines (+8/-3)
1 file modified
addons/openerp/static/javascript/form.js (+8/-3)
To merge this branch: bzr merge lp:~julie-w/unifield-web/US-4638
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+356821@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/static/javascript/form.js'
2--- addons/openerp/static/javascript/form.js 2018-07-19 15:34:42 +0000
3+++ addons/openerp/static/javascript/form.js 2018-10-16 13:04:57 +0000
4@@ -922,12 +922,17 @@
5 }
6 v = value.split(',');
7 ref.value = v[0];
8+ fld._m2o.on_reference_changed();
9+ if (v[1] == '0') {
10+ v[1] = '';
11+ }
12 fld.value = v[1] || '';
13- fld._m2o.on_reference_changed();
14+ if (v[1]) {
15+ fld._m2o.on_change();
16+ }
17 try {
18 openobject.dom.get(prefix + k + '_text').value = v[2] || '';
19- }
20- catch (e) {
21+ } catch(e) {
22 }
23 }
24 break;

Subscribers

People subscribed via source and target branches