Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/sp-215 into lp:unifield-web

  1. sp-215
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4773
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/sp-215
Merge into: lp:unifield-web
Diff against target: 26 lines (+3/-2)
2 files modified
addons/openerp/controllers/templates/imp.mako (+1/-1)
addons/openerp/static/javascript/listgrid.js (+2/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/sp-215
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+278283@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/controllers/templates/imp.mako'
2--- addons/openerp/controllers/templates/imp.mako 2011-01-17 10:06:57 +0000
3+++ addons/openerp/controllers/templates/imp.mako 2015-11-23 08:37:15 +0000
4@@ -201,7 +201,7 @@
5 <td class="side_spacing">
6 <table width="100%">
7 <tr>
8- <td class="imp-header" align="right">
9+ <td class="imp-header" align="left">
10 <a class="button-a" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Close")}</a>
11 <a class="button-a" href="javascript: void(0)" onclick="do_import();">${_("Import File")}</a>
12 </td>
13
14=== modified file 'addons/openerp/static/javascript/listgrid.js'
15--- addons/openerp/static/javascript/listgrid.js 2015-05-19 14:41:33 +0000
16+++ addons/openerp/static/javascript/listgrid.js 2015-11-23 08:37:15 +0000
17@@ -1083,7 +1083,8 @@
18 _terp_view_mode : this.view_mode})
19 }, null, {
20 height: '98%',
21- max_height: 550
22+ max_height: 550,
23+ width: '95%'
24 });
25 }
26 });

Subscribers

People subscribed via source and target branches