# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1307608621 -7200
# Node ID 4be45b64d75572d43322a34105b230a83d138009
# Parent  7dc405ad7bf35bdcd833517d7b7a97a9849d7a69# Parent  a70456bbb4bddc9e1a9b5a075836edd3c858c4c1
merge changes from stable branch

diff -r 7dc405ad7bf3 -r 4be45b64d755 web/views/iprogress.py
--- a/web/views/iprogress.py	Wed Jun 08 17:10:39 2011 +0200
+++ b/web/views/iprogress.py	Thu Jun 09 10:37:01 2011 +0200
@@ -177,12 +177,11 @@
 
     @classmethod
     def overrun(cls, iprogress):
-        """overrun = done + todo - """
         done = iprogress.done or 0
         todo = iprogress.todo or 0
-        revised_cost = iprogress.revised_cost or 0
-        if done + todo > revised_cost:
-            overrun = done + todo - revised_cost
+        budget = iprogress.revised_cost or 0
+        if done + todo > budget:
+            overrun = done + todo - budget
         else:
             overrun = 0
         if overrun < cls.precision:
@@ -191,11 +190,10 @@
 
     @classmethod
     def overrun_percentage(cls, iprogress):
-        """pourcentage overrun = overrun / budget"""
-        revised_cost = iprogress.revised_cost or 0
-        if revised_cost == 0:
+        budget = iprogress.revised_cost or 0
+        if budget == 0:
             return 0
-        return cls.overrun(iprogress) * 100. / revised_cost
+        return cls.overrun(iprogress) * 100. / budget
 
     def cell_call(self, row, col):
         self._cw.add_css('cubicweb.iprogress.css')