Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] total tax column in item-wise sales/purchase register

Browse Source
This commit is contained in:
Nabin Hait 2013-07-26 15:45:38 +05:30
parent af1df68c13
commit a10ef4592b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -21,7 +21,7 @@ from webnotes.utils import flt
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
columns = get_columns() columns = get_columns()
last_col = len(columns) - 1 last_col = len(columns)
item_list = get_items(filters) item_list = get_items(filters)
aii_account_map = get_aii_accounts() aii_account_map = get_aii_accounts()
@ -36,7 +36,9 @@ def execute(filters=None):
for tax in tax_accounts: for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0)) 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) data.append(row)
return columns, data return columns, data
@ -104,6 +106,6 @@ def get_tax_accounts(item_list, columns):
tax_accounts.sort() tax_accounts.sort()
columns += [account_head + ":Currency:80" for account_head in tax_accounts] 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 return item_tax, tax_accounts

8
accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -21,7 +21,7 @@ from webnotes.utils import flt
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
columns = get_columns() columns = get_columns()
last_col = len(columns) - 1 last_col = len(columns)
item_list = get_items(filters) item_list = get_items(filters)
item_tax, tax_accounts = get_tax_accounts(item_list, columns) item_tax, tax_accounts = get_tax_accounts(item_list, columns)
@ -35,7 +35,9 @@ def execute(filters=None):
for tax in tax_accounts: for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0)) 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) data.append(row)
return columns, data return columns, data
@ -100,6 +102,6 @@ def get_tax_accounts(item_list, columns):
tax_accounts.sort() tax_accounts.sort()
columns += [account_head + ":Currency:80" for account_head in tax_accounts] 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 return item_tax, tax_accounts