Odoo GTK Client (MOVED TO GITHUB)

Merge lp:~openerp-commiter/openobject-client/6.0-opw-381724-nch into lp:openobject-client/6.0

  1. 6.0-opw-381724-nch
  2. Merge into 6.0
Proposed by Naresh(OpenERP)
Status: Merged
Merged at revision: 1944
Proposed branch: lp:~openerp-commiter/openobject-client/6.0-opw-381724-nch
Merge into: lp:openobject-client/6.0
Diff against target: 32 lines (+10/-1)
2 files modified
bin/modules/gui/window/form.py (+8/-1)
bin/widget/screen/screen.py (+2/-0)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-client/6.0-opw-381724-nch
Reviewer Review Type Date Requested Status
Olivier Laurent (Open ERP) Pending
Review via email: mp+89854@code.launchpad.net

Description of the change

Hello,

Case 381724:

export : raise a pop up when try to export data in group by environment with no_leaf set as True also set the limit to Unlimited in group by environment by default"

Thanks

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 'bin/modules/gui/window/form.py'
2--- bin/modules/gui/window/form.py 2011-09-23 12:25:35 +0000
3+++ bin/modules/gui/window/form.py 2012-01-24 10:33:27 +0000
4@@ -302,7 +302,14 @@
5 while(self.screen.view_to_load):
6 self.screen.load_view_to_load()
7 screen_fields = copy.deepcopy(self.screen.models.fields)
8- win = win_export.win_export(self.model, self.screen.ids_get(), screen_fields, fields, parent=self.window, context=self.context)
9+ ids = self.screen.ids_get()
10+ if not ids:
11+ msg = _('No records to export! \n Select at least one record ')
12+ if not ids and self.context.get('group_by_no_leaf', False):
13+ msg = _('You cannot export these record(s) ! Either use copy and paste')
14+ common.warning(msg,_('Warning !'), parent=self.window)
15+ return
16+ win = win_export.win_export(self.model, ids, screen_fields, fields, parent=self.window, context=self.context)
17 res = win.go()
18
19 def sig_new(self, widget=None, autosave=True):
20
21=== modified file 'bin/widget/screen/screen.py'
22--- bin/widget/screen/screen.py 2012-01-24 07:25:44 +0000
23+++ bin/widget/screen/screen.py 2012-01-24 10:33:27 +0000
24@@ -157,6 +157,8 @@
25 self.filter_widget = widget_search.form(self.search_view['arch'],
26 self.search_view['fields'], self.name, self.window,
27 self.domain, (self, self.search_filter))
28+ if self.context.has_key('group_by'):
29+ self.limit = None
30 self.screen_container.add_filter(self.filter_widget.widget,
31 self.search_filter, self.search_clear,
32 self.search_offset_next,