--- /root/bacula-git-a/bacula/src/cats/sql.c	2016-02-18 01:35:16.119043500 -0200
+++ /root/bacula-git-b/bacula/src/cats/sql.c	2016-02-17 23:18:23.903043500 -0200
@@ -546,14 +546,8 @@
       if (row[i] == NULL) { 
          bsnprintf(buf, sizeof(buf), " %-*s |", max_len, "NULL"); 
       } else if (mdb->sql_field_is_numeric(field->type) && !jcr->gui && is_an_integer(row[i])) { 
-           /* Check field names and convert to bytes human readable */
-           if( strcmp(field->name, "MaxVolBytes") == 0 || strcmp(field->name, "VolBytes") == 0 || 
-               strcmp(field->name, "JobBytes") == 0 || strcmp(field->name, "Bytes") == 0 ) {
-               bsnprintf(buf, sizeof(buf), " %*sB|", max_len, edit_uint64_with_suffix(atol(row[i]), ewc));
-           /* Just add commas */
-           } else {
-               bsnprintf(buf, sizeof(buf), " %*s |", max_len, add_commas(row[i], ewc));
-           }
+         bsnprintf(buf, sizeof(buf), " %*s |", max_len, 
+                   add_commas(row[i], ewc)); 
       } else { 
          bsnprintf(buf, sizeof(buf), " %-*s |", max_len, row[i]); 
       } 
@@ -574,8 +568,8 @@
       if (row[i] == NULL) { 
          bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL"); 
       } else if (mdb->sql_field_is_numeric(field->type) && !jcr->gui && is_an_integer(row[i])) { 
-           bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
-                     edit_uint64_with_suffix(atol(row[i]), ewc)); 
+         bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
+                   add_commas(row[i], ewc)); 
       } else { 
          bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]); 
       } 
@@ -690,16 +684,8 @@
          if (row[i] == NULL) { 
             bsnprintf(buf, sizeof(buf), " %-*s |", max_len, "NULL"); 
          } else if (mdb->sql_field_is_numeric(field->type) && !jcr->gui && is_an_integer(row[i])) { 
-           /* Check field names and convert to bytes human readable */
-           if( strcmp(field->name, "MaxVolBytes") == 0 || strcmp(field->name, "VolBytes") == 0 || 
-               strcmp(field->name, "JobBytes") == 0 || strcmp(field->name, "Bytes") == 0 ) {
-               bsnprintf(buf, sizeof(buf), " %*sB|", max_len, 
-                         edit_uint64_with_suffix(atol(row[i]), ewc));
-           /* Just add commas */
-           } else {
-                bsnprintf(buf, sizeof(buf), " %*s |", max_len, 
-                          add_commas(row[i], ewc));
-           }
+            bsnprintf(buf, sizeof(buf), " %*s |", max_len, 
+                      add_commas(row[i], ewc)); 
          } else { 
             bsnprintf(buf, sizeof(buf), " %-*s |", max_len, row[i]); 
          } 
@@ -723,8 +709,8 @@
          if (row[i] == NULL) { 
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL"); 
          } else if (mdb->sql_field_is_numeric(field->type) && !jcr->gui && is_an_integer(row[i])) { 
-              bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
-                        add_commas(row[i], ewc)); 
+            bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
+                add_commas(row[i], ewc)); 
          } else { 
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]); 
          }