nch(OpenERP) has proposed merging 
lp:~openerp-commiter/openobject-client/groupby_sort_client into 
lp:openobject-client.

Requested reviews:
  OpenERP sa GTK client R&D (openerp-dev-gtk)

-- 
https://code.launchpad.net/~openerp-commiter/openobject-client/groupby_sort_client/+merge/35267
Your team OpenERP sa GTK client R&D is requested to review the proposed merge 
of lp:~openerp-commiter/openobject-client/groupby_sort_client into 
lp:openobject-client.
=== modified file 'bin/widget/view/list.py'
--- bin/widget/view/list.py	2010-09-08 06:44:57 +0000
+++ bin/widget/view/list.py	2010-09-13 11:18:48 +0000
@@ -760,7 +760,7 @@
                             ids.append(child.id)
                 process(model)
             else:
-                if model.id:
+                if model and model.id:
                     ids.append(model.id)
         ids = []
         sel = self.widget_tree.get_selection()

=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py	2010-08-31 05:40:24 +0000
+++ bin/widget/view/tree_gtk/parser.py	2010-09-13 11:18:48 +0000
@@ -60,7 +60,12 @@
     if unsaved_model:
         res =  common.message(_('You have unsaved record(s) !  \n\nPlease Save them before sorting !'))
         return res
-    group_by = screen.context.get('group_by',False)
+    group_by = screen.context.get('group_by', False)
+    group_by_no_leaf = screen.context.get('group_by_no_leaf',False)
+    if (group_by  and \
+       column.name in group_by)\
+       or group_by_no_leaf:
+        return
     screen.current_view.set_drag_and_drop(column.name == 'sequence')
     if screen.sort == column.name:
         screen.sort = column.name+' desc'

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to