[minor] total tax column in item-wise sales/purchase register
diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 3840837..9093d11 100644
--- a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -21,7 +21,7 @@
def execute(filters=None):
if not filters: filters = {}
columns = get_columns()
- last_col = len(columns) - 1
+ last_col = len(columns)
item_list = get_items(filters)
aii_account_map = get_aii_accounts()
@@ -35,8 +35,10 @@
d.purchase_receipt, expense_head, d.qty, d.rate, d.amount]
for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
-
- row.append(sum(row[last_col:]))
+
+ total_tax = sum(row[last_col:])
+ row += [total_tax, d.amount + total_tax]
+
data.append(row)
return columns, data
@@ -104,6 +106,6 @@
tax_accounts.sort()
columns += [account_head + ":Currency:80" for account_head in tax_accounts]
- columns.append("Total:Currency:80")
+ columns += ["Total Tax:Currency:80", "Total:Currency:80"]
return item_tax, tax_accounts
\ No newline at end of file
diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 9df994a..14d6863 100644
--- a/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -21,7 +21,7 @@
def execute(filters=None):
if not filters: filters = {}
columns = get_columns()
- last_col = len(columns) - 1
+ last_col = len(columns)
item_list = get_items(filters)
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
@@ -35,7 +35,9 @@
for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
- row.append(sum(row[last_col:]))
+ total_tax = sum(row[last_col:])
+ row += [total_tax, d.amount + total_tax]
+
data.append(row)
return columns, data
@@ -100,6 +102,6 @@
tax_accounts.sort()
columns += [account_head + ":Currency:80" for account_head in tax_accounts]
- columns.append("Total:Currency:80")
+ columns += ["Total Tax:Currency:80", "Total:Currency:80"]
return item_tax, tax_accounts
\ No newline at end of file