Merge lp:~openerp-dev/openobject-client/6.1-opw-575749-rgo into lp:openobject-client/6.1

[Ravi Gohil (OpenERP)]

Hello,

When the calendar view doesn't get the value for it's fields, it shows `False` as a string and not the blank string.

You can reproduce the issue by defining a meeting and not setting the value for the fields `Sales Team` or `Partner`.

This MP contains fix for this issue. Kindly review it.

Thanks.

[lp:~openerp-dev/openobject-client/6.1-opw-575749-rgo]

2065. By Launchpad Translations on behalf of openerp on 2012-06-14

Launchpad automatic translations update.

2066. By Ravi Gohil (OpenERP) on 2012-06-14

[FIX] entries in calendar view shows 'False' as a string if there is no value in the field: (Maintenance Case : 575749)

[Naresh(OpenERP) (nch-openerp)]

just modified the patch a bit before final merge

=== modified file 'bin/widget/view/calendar_gtk/parser.py'
--- bin/widget/view/calendar_gtk/parser.py 2011-10-31 09:12:35 +0000
+++ bin/widget/view/calendar_gtk/parser.py 2012-07-20 06:25:32 +0000
@@ -440,13 +440,14 @@

             if isinstance(s, (tuple, list)): s = s[-1]

- caption = ustr(s)
-
+ if not (isinstance(s,bool) or self.fields[f]['type'] == 'boolean'):
+ caption = ustr(s)
+
             for f in self.axis[1:]:
                 s = event[f]
                 if isinstance(s, (tuple, list)): s = s[-1]
-
- description += [ustr(s)]
+ if not (isinstance(s, bool) or self.fields[f]['type'] == 'boolean'):
+ description += [ustr(s)]

         starts = event.get(self.date_start)
         ends = event.get(self.date_delay) or 1.0

=== modified file 'bin/SpiffGtkWidgets/Calendar/CanvasEvent.py'
--- bin/SpiffGtkWidgets/Calendar/CanvasEvent.py	2010-12-13 09:52:05 +0000
+++ bin/SpiffGtkWidgets/Calendar/CanvasEvent.py	2012-06-14 06:07:22 +0000
@@ -41,7 +41,7 @@
         self.append(self.text, hippo.PACK_EXPAND)
 
     def set_text(self, text, description = ''):
-        self.text.set_property('text', text + ', ' + description)
+        self.text.set_property('text', text + ', ' + description if text and description else text or description or '')
 
 
     def set_text_color(self, newcolor):
 
=== modified file 'bin/widget/view/calendar_gtk/parser.py'
--- bin/widget/view/calendar_gtk/parser.py	2011-10-31 09:12:35 +0000
+++ bin/widget/view/calendar_gtk/parser.py	2012-06-14 06:07:22 +0000
@@ -440,13 +440,13 @@
 
             if isinstance(s, (tuple, list)): s = s[-1]
 
-            caption = ustr(s)
+            caption = ustr(s) if not isinstance(s, bool) else '' if not self.fields[f]['type'] == 'boolean' else ustr(s)
 
             for f in self.axis[1:]:
                 s = event[f]
                 if isinstance(s, (tuple, list)): s = s[-1]
 
-                description += [ustr(s)]
+                description += [ustr(s)] if not isinstance(s, bool) else [] if not self.fields[f]['type'] == 'boolean' else [ustr(s)]
 
         starts = event.get(self.date_start)
         ends = event.get(self.date_delay) or 1.0