Merge lp:~openerp-dev/openobject-client-web/6.0-opw-593396-msh into lp:openobject-client-web

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of month sorting on graph axis, if the field type is selection type then it should not be sorted alphabetically instead it should be displayed as it has been defined in code because selection field generally have ordered data like state, month etc. if there is state then it should be displayed as it is defined in the code, generally state defined in order of process which going to execute like draft, then confirm etc.

Demo:- Purchase -> Purchase Dashboard -> see the graph view x-axis has month, month comes in alphabetical order, it should be come in the order it is defined, also state field should also come in ther order it is defined(generally selection field have the data which is in particular order say for example state, it is defined in the code according to its execution sequence in process 1. draft, 2. confirm, 3. done).

So restrict alphabetical sorting on selection field for graph view axis.

Thanks.

Unmerged revisions

4914. By Mohammed Shekha<email address hidden> on 2013-06-13

[FIX]Fixed the issue of month sorting on graph axis, if the field type is selection type then it should not be sorted alphabetically instead it should be displayed as it has been defined in code because selection field generally have ordered data like state, month etc. if there is state then it should be displayed as it is defined in the code, generally state defined in order of process which going to execute like draft, then confirm etc.

=== modified file 'addons/view_graph/widgets/_graph.py'
--- addons/view_graph/widgets/_graph.py	2011-02-02 11:23:42 +0000
+++ addons/view_graph/widgets/_graph.py	2013-06-13 05:30:35 +0000
@@ -196,6 +196,8 @@
                 fields[name].update(attrs) # Update fields ...
 
                 attrs['string'] = fields[name]['string']
+                if fields[name].get('type', False) == 'selection':
+                    attrs['selection'] = fields[name]['selection']
 
                 axis.append(ustr(name))
                 axis_data[ustr(name)] =  attrs
@@ -270,7 +272,12 @@
         keys = keys.keys()
         keys.sort()
 
-        for l in sorted(label.iterkeys()):
+        if 'selection' in axis_data[axis[0]]:
+            act_sel = axis_data[axis[0]].get('selection', False)
+            label = [y for x, y in act_sel if y in label.keys()]
+        else:
+            label = sorted(label.iterkeys())
+        for l in label:
             x = 0
             for i in total_ids:
                 if i.get('prod_id') == l and x == 0: