diff --git a/lib/ui/app/presenters/entity_presenter.dart b/lib/ui/app/presenters/entity_presenter.dart
index 7fb6bc130..5b6ea6f8b 100644
--- a/lib/ui/app/presenters/entity_presenter.dart
+++ b/lib/ui/app/presenters/entity_presenter.dart
@@ -105,7 +105,10 @@ class EntityPresenter {
       ].contains(field);
 
   static bool isFieldAmount(String field) {
-    return ['quantity'].contains(field);
+    return [
+      'quantity',
+      'stock_quantity',
+    ].contains(field);
   }
 
   static bool isFieldNumeric(String field) {
diff --git a/lib/ui/reports/product_report.dart b/lib/ui/reports/product_report.dart
index 96b181a22..c6f845d22 100644
--- a/lib/ui/reports/product_report.dart
+++ b/lib/ui/reports/product_report.dart
@@ -149,7 +149,7 @@ ReportResult productReport(
           );
           break;
         case ProductReportFields.stock_quantity:
-          value = product.stockQuantity;
+          value = product.stockQuantity.toDouble();
           break;
         case ProductReportFields.notification_threshold:
           value = productNotificationThreshold(
@@ -174,7 +174,10 @@ ReportResult productReport(
 
       if (value.runtimeType == bool) {
         row.add(product.getReportBool(value: value));
-      } else if (column == ProductReportFields.quantity) {
+      } else if ([
+        ProductReportFields.quantity,
+        ProductReportFields.stock_quantity
+      ].contains(column)) {
         row.add(product.getReportDouble(
           value: value,
           currencyId: userCompany.company.currencyId,
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index ba10bb39d..704300e26 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -1355,7 +1355,7 @@ class ReportResult {
         } else if (columnType == ReportColumnType.number) {
           final currencyId = values['${column}_currency_id'];
           value = formatNumber(values[column], context,
-              formatNumberType: column == 'quantity'
+              formatNumberType: column.toLowerCase().contains('quantity')
                   ? FormatNumberType.double
                   : FormatNumberType.money,
               currencyId: