Merge lp:~openerp-dev/openobject-client/dev_client_rga into lp:openobject-client

[Ravi Gadhia (OpenERP)]

Hello,
   My branch fixed following bug
   https://bugs.launchpad.net/openobject-client/+bug/702772

Thanks

[Naresh(OpenERP) (nch-openerp)]

please send proposal to dev-client

Thanks

review: Needs Resubmitting

Unmerged revisions

1440. By Ravi Gadhia (OpenERP) on 2011-01-19

Merge with trunk client

=== modified file 'bin/modules/gui/main.py'
--- bin/modules/gui/main.py	2011-01-07 10:03:46 +0000
+++ bin/modules/gui/main.py	2011-01-17 10:33:47 +0000
@@ -864,8 +864,10 @@
             if action:
                 ctx = rpc.session.context.copy()
                 obj = service.LocalService('action.main')
-                obj.exec_keyword('tree_but_open', {'model': 'ir.ui.menu', 'id': action[0],
-                    'ids': [action[0]], 'report_type': 'pdf', 'window': self.window}, context=ctx)
+                if not isinstance(action, int):
+                    action = action[0]
+                obj.exec_keyword('tree_but_open', {'model': 'ir.ui.menu', 'id': action,
+                    'ids': [action], 'report_type': 'pdf', 'window': self.window}, context=ctx)
 
         if sc is None:
             uid = rpc.session.uid

=== modified file 'bin/widget/view/calendar_gtk/parser.py'
--- bin/widget/view/calendar_gtk/parser.py	2010-12-21 12:52:36 +0000
+++ bin/widget/view/calendar_gtk/parser.py	2011-01-17 10:33:47 +0000
@@ -325,10 +325,11 @@
         if models:
             self.models = models.models
             self.models_record_group = models
-
+            model_lst = [model for model in self.models if not isinstance(model.id, int)]
+            if model_lst:
+                self.models = model_lst
             if self.models:
                 self.__update_colors()
-
                 self.cal_model.remove_events()
                 self.cal_model.add_events(self.__get_events())
                 self.modex = self.mode