Merge lp:~openerp-dev/openobject-client/6.0-opw-593779-rgo into lp:openobject-client/6.0

[Ravi Gohil (OpenERP)]

Hi,

This branch fixes the issue of month names are not in sequence in graph view(as it orders records by it's label string). This issue can be seen in Purchase dashboard(Monthly Purchase by category graph view).

Actually, this branch does not sort anything, it just shows the selection field records as it is defined in the coding.

Kindly review the fix and share your views on it.

Thanks.

Unmerged revisions

1966. By Ravi Gohil (OpenERP) on 2013-06-18

[FIX] In graph view, selection field value should be shown as it is defined in coding and should not be sorted according it's label string. (Maintenance Case: 593779)

=== modified file 'bin/tinygraph/__init__.py'
--- bin/tinygraph/__init__.py	2011-01-06 10:27:51 +0000
+++ bin/tinygraph/__init__.py	2013-06-20 07:19:30 +0000
@@ -67,8 +67,12 @@
 
     axis_group = axis_group.keys()
     axis_group.sort()
+    act_sel = axis_data[axis[0]].get('selection', False)
     axis_lable = dic_lable.keys()
-    axis_lable.sort()
+    if act_sel:
+        axis_lable = [y for x, y in act_sel if y in axis_lable]
+    else:
+        axis_lable.sort()
 
     tmp = {}
     except_tmp = []