Merge lp:~openerp-dev/openobject-client/calendar_fix into lp:~openerp-dev/openobject-client/trunk-dev-client

[Ravi Gadhia (OpenERP)]

=== modified file 'bin/modules/gui/window/form.py'
--- bin/modules/gui/window/form.py	2011-01-13 05:47:45 +0000
+++ bin/modules/gui/window/form.py	2011-01-25 10:21:15 +0000
@@ -299,6 +299,8 @@
         if autosave:
             if not self.modified_save():
                 return
+        if self.screen.current_view.view_type in ['calendar','graph']:
+            return
         self.screen.create_new = True
         self.screen.new()
         self.message_state('')

=== modified file 'bin/widget/view/calendar_gtk/parser.py'
--- bin/widget/view/calendar_gtk/parser.py	2011-01-17 06:43:44 +0000
+++ bin/widget/view/calendar_gtk/parser.py	2011-01-25 10:21:15 +0000
@@ -280,11 +280,10 @@
 
         for model in models:
             name = value = key = model.value[color_field]
-
             if isinstance(key, (tuple, list)):
                 value, name = key
                 key = tuple(key)
-
+                
             if key in colors:
                 # already present skip
                 continue
@@ -293,7 +292,7 @@
             # 'color' field
             field_color = None
             field_widget = model.mgroup.mfields.get(color_field, False)
-            if field_widget and field_widget.attrs['type'] == 'many2one':
+            if value and field_widget and field_widget.attrs['type'] == 'many2one':
                 fproxy = RPCProxy(field_widget.attrs['relation'])
                 try:
                     fdata = fproxy.read(value, [color_field_custom])