fix: net amount and total amount if expenses

umarless · Aug 12, 2024 · b9f9264 · b9f9264
1 parent b897461
commit b9f9264
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/nirjay_customization/nirjay_customization/report/expense_workbook/expense_workbook.py b/nirjay_customization/nirjay_customization/report/expense_workbook/expense_workbook.py
@@ -429,16 +429,16 @@ def get_data(filters):
             if e.sgst_amount and e.cgst_amount:
                 new_row = {
                         'particulars': e.item_name,
-                        'amount': e.base_amount,
-                        'net_amount': e.base_net_amount + e.sgst_amount + e.cgst_amount,
+                        'amount': e.base_net_amount + e.sgst_amount + e.cgst_amount,
+                        'net_amount': e.base_net_amount,
                         'sgst': e.sgst_amount,
                         'cgst':  e.cgst_amount
                     }
             elif e.igst_amount:
                 new_row = {
                         'particulars': e.item_name,
-                        'amount': e.base_amount,
-                        'net_amount': e.base_net_amount + e.igst_amount,
+                        'amount': e.base_net_amount + e.igst_amount,
+                        'net_amount': e.base_net_amount,
                         'igst': e.igst_amount
                     }
             else: