Odoo GTK Client (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-client/6.1-opw-576895-skh into lp:openobject-client/6.1

  1. 6.1-opw-576895-skh
  2. Merge into 6.1
Proposed by Somesh Khare
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: 2070
Merged at revision: 2073
Proposed branch: lp:~openerp-dev/openobject-client/6.1-opw-576895-skh
Merge into: lp:openobject-client/6.1
Diff against target: 25 lines (+3/-1)
2 files modified
bin/modules/gui/window/win_import.py (+2/-0)
bin/openerp.ui (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client/6.1-opw-576895-skh
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+115113@code.launchpad.net

Description of the change

Hello Sir,

[FIX] win_import.py: Selection field Encoding did not select encoding options (UTF-8 or Latin 1) on Import form.

Thanks,
Somesh Khare

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/modules/gui/window/win_import.py'
2--- bin/modules/gui/window/win_import.py 2011-10-11 13:15:05 +0000
3+++ bin/modules/gui/window/win_import.py 2012-07-16 11:20:32 +0000
4@@ -99,6 +99,8 @@
5 self.ui.get_object('import_vp_right').add(self.view2)
6 self.view1.set_headers_visible(False)
7 self.view2.set_headers_visible(False)
8+ self.encoding = self.ui.get_object('import_csv_combo')
9+ self.encoding.set_active(0)
10
11 cell = gtk.CellRendererText()
12 column = gtk.TreeViewColumn(_('Field name'), cell, text=0, background=2)
13
14=== modified file 'bin/openerp.ui'
15--- bin/openerp.ui 2011-12-09 11:22:31 +0000
16+++ bin/openerp.ui 2012-07-16 11:20:32 +0000
17@@ -5141,7 +5141,7 @@
18 <property name="column_spacing">8</property>
19 <property name="row_spacing">9</property>
20 <child>
21- <object class="GtkComboBoxEntry" id="import_csv_combo">
22+ <object class="GtkComboBox" id="import_csv_combo">
23 <property name="visible">True</property>
24 <property name="model">liststore6</property>
25 <child>

Subscribers

People subscribed via source and target branches