Merge pull request burke-software#79 from SacNaturalFoods/row-totals-format-bug

Fixed row totals bug when incompatible format string is in effect.

Author: bufke

report_builder/views.py

@@ -579,8 +579,14 @@ def increment_total(display_field_key, display_totals, val):
                         value = Decimal(display_totals_row[df.position-1])
                     except:
                         value = display_totals_row[df.position-1]
-                    display_totals_row[df.position-1] = df.display_format.string.\
-                        format(value)
+                    # Fall back to original value if format string and value
+                    # aren't compatible, e.g. a numerically-oriented format
+                    # string with value which is not numeric.
+                    try:
+                        value = df.display_format.string.format(value)
+                    except ValueError:
+                        pass
+                    display_totals_row[df.position-1] = value
 
         if display_totals:
             values_and_properties_list = (