Merge lp:~openerp-dev/openobject-server/6.0-bug-513746-rha into lp:openobject-server/6.0

[Rifakat Husen (OpenERP)]

report: pie chart printing problem, set variable outside the loop

[Jay Vora (Serpent Consulting Services) (jayvora)]

Rifakat,

It seems like this part of code is obsolete now, it is not being used anywhere.

Hence, I am rejecting this branch.

Thanks for the fix.

Note that similar fix has landed into 5.0

Unmerged revisions

3444. By Truong Nguyen (www.trobz.com) on 2011-06-16

[FIX] report: set variable outside the loop for resolving pie chart printing problem

=== modified file 'bin/report/custom.py'
--- bin/report/custom.py	2010-09-23 10:01:45 +0000
+++ bin/report/custom.py	2011-06-16 12:06:34 +0000
@@ -430,12 +430,11 @@
                     data_cum.append([k, float(data[k])+float(prev)])
                     if fields[idx+1]['cumulate']:
                         prev += data[k]
-                idx0 = 0
                 plot = line_plot.T(label=fields[idx+1]['name']+' '+str(line), data = data_cum, line_style=colors[idx0*(len(fields)-1)+idx])
                 ar.add_plot(plot)
                 abscissa.update(fields_bar[idx])
                 idx0 += 1
-        
+
         abscissa = map(lambda x : [x, None], abscissa)
         ar.x_coord = category_coord.T(abscissa,0)
         ar.draw(can)
@@ -502,8 +501,9 @@
 
         nb_bar = len(data_by_year)*(len(fields)-1)
         colors = map(lambda x:fill_style.Plain(bgcolor=x), misc.choice_colors(nb_bar))
-        
+
         abscissa = {}
+        idx0 = 0
         for line in data_by_year.keys():
             fields_bar = []
             # sum data and save it in a list. An item for a fields
@@ -530,8 +530,7 @@
                     data_cum.append([k, float(data[k])+float(prev)])
                     if fields[idx+1]['cumulate']:
                         prev += data[k]
-                        
-                idx0 = 0
+
                 plot = bar_plot.T(label=fields[idx+1]['name']+' '+str(line), data = data_cum, cluster=(idx0*(len(fields)-1)+idx,nb_bar), fill_style=colors[idx0*(len(fields)-1)+idx])
                 ar.add_plot(plot)
                 abscissa.update(fields_bar[idx])