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

[fix][report] sales/purchase register, same accounts as income and tax account

Browse Source
This commit is contained in:
Nabin Hait 2013-07-09 15:38:40 +05:30
parent 690c2f5ffe
commit 5c33e59e7a
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
accounts/report/purchase_register/purchase_register.py
View File

@ -23,7 +23,7 @@ def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
invoice_list = get_invoices(filters) invoice_list = get_invoices(filters)
columns, expense_accounts, tax_accounts = get_columns(invoice_list) columns, expense_accounts, tax_accounts, renamed_columns = get_columns(invoice_list)
if not invoice_list: if not invoice_list:
@ -31,7 +31,7 @@ def execute(filters=None):
return columns, invoice_list return columns, invoice_list
invoice_expense_map = get_invoice_expense_map(invoice_list) invoice_expense_map = get_invoice_expense_map(invoice_list)
invoice_tax_map = get_invoice_tax_map(invoice_list) invoice_tax_map = get_invoice_tax_map(invoice_list, renamed_columns)
invoice_po_pr_map = get_invoice_po_pr_map(invoice_list) invoice_po_pr_map = get_invoice_po_pr_map(invoice_list)
account_map = get_account_details(invoice_list) account_map = get_account_details(invoice_list)
@ -73,7 +73,9 @@ def get_columns(invoice_list):
"Project:Link/Project:80", "Bill No::120", "Bill Date:Date:80", "Remarks::150", "Project:Link/Project:80", "Bill No::120", "Bill Date:Date:80", "Remarks::150",
"Purchase Order:Link/Purchase Order:100", "Purchase Receipt:Link/Purchase Receipt:100" "Purchase Order:Link/Purchase Order:100", "Purchase Receipt:Link/Purchase Receipt:100"
] ]
expense_accounts = tax_accounts = [] expense_accounts = tax_accounts = expense_columns = tax_columns = []
renamed_columns = {}
if invoice_list: if invoice_list:
expense_accounts = webnotes.conn.sql_list("""select distinct expense_head expense_accounts = webnotes.conn.sql_list("""select distinct expense_head
from `tabPurchase Invoice Item` where docstatus = 1 and ifnull(expense_head, '') != '' from `tabPurchase Invoice Item` where docstatus = 1 and ifnull(expense_head, '') != ''
@ -86,12 +88,22 @@ def get_columns(invoice_list):
order by account_head""" % order by account_head""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list])) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
columns = columns + [(account + ":Currency:120") for account in expense_accounts] + \
["Net Total:Currency:120"] + [(account + ":Currency:120") for account in tax_accounts] + \ expense_columns = [(account + ":Currency:120") for account in expense_accounts]
for account in tax_accounts:
if account in expense_accounts:
new_account = account + " (Tax)"
renamed_columns[account] = new_account
tax_columns.append(new_account + ":Currency:120")
else:
tax_columns.append(account + ":Currency:120")
columns = columns + expense_columns + \
["Net Total:Currency:120"] + tax_columns + \
["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + \ ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + \
["Rounded Total:Currency:120"] + ["Outstanding Amount:Currency:120"] ["Rounded Total:Currency:120"] + ["Outstanding Amount:Currency:120"]
return columns, expense_accounts, tax_accounts return columns, expense_accounts, tax_accounts, renamed_columns
def get_conditions(filters): def get_conditions(filters):
conditions = "" conditions = ""
@ -125,15 +137,16 @@ def get_invoice_expense_map(invoice_list):
return invoice_expense_map return invoice_expense_map
def get_invoice_tax_map(invoice_list): def get_invoice_tax_map(invoice_list, renamed_columns):
tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount
from `tabPurchase Taxes and Charges` where parent in (%s) group by parent, account_head""" % from `tabPurchase Taxes and Charges` where parent in (%s) group by parent, account_head""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
invoice_tax_map = {} invoice_tax_map = {}
for d in tax_details: for d in tax_details:
invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(d.account_head, []) account = renamed_columns.get(d.account_head) or d.account_head
invoice_tax_map[d.parent][d.account_head] = flt(d.tax_amount) invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(account, [])
invoice_tax_map[d.parent][account] = flt(d.tax_amount)
return invoice_tax_map return invoice_tax_map

32
accounts/report/sales_register/sales_register.py
View File

@ -23,14 +23,14 @@ def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
invoice_list = get_invoices(filters) invoice_list = get_invoices(filters)
columns, income_accounts, tax_accounts = get_columns(invoice_list) columns, income_accounts, tax_accounts, renamed_columns = get_columns(invoice_list)
if not invoice_list: if not invoice_list:
msgprint(_("No record found")) msgprint(_("No record found"))
return columns, invoice_list return columns, invoice_list
invoice_income_map = get_invoice_income_map(invoice_list) invoice_income_map = get_invoice_income_map(invoice_list)
invoice_tax_map = get_invoice_tax_map(invoice_list) invoice_tax_map = get_invoice_tax_map(invoice_list, renamed_columns)
invoice_so_dn_map = get_invoice_so_dn_map(invoice_list) invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
customer_map = get_customer_deatils(invoice_list) customer_map = get_customer_deatils(invoice_list)
@ -74,7 +74,9 @@ def get_columns(invoice_list):
"Remarks::150", "Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100" "Remarks::150", "Sales Order:Link/Sales Order:100", "Delivery Note:Link/Delivery Note:100"
] ]
income_accounts = tax_accounts = [] income_accounts = tax_accounts = income_columns = tax_columns = []
renamed_columns = {}
if invoice_list: if invoice_list:
income_accounts = webnotes.conn.sql_list("""select distinct income_account income_accounts = webnotes.conn.sql_list("""select distinct income_account
from `tabSales Invoice Item` where docstatus = 1 and parent in (%s) from `tabSales Invoice Item` where docstatus = 1 and parent in (%s)
@ -83,15 +85,24 @@ def get_columns(invoice_list):
tax_accounts = webnotes.conn.sql_list("""select distinct account_head tax_accounts = webnotes.conn.sql_list("""select distinct account_head
from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice' from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
and docstatus = 1 and parent in (%s) order by account_head""" % and docstatus = 1 and ifnull(tax_amount, 0) > 0
and parent in (%s) order by account_head""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list])) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
columns = columns + [(account + ":Currency:120") for account in income_accounts] + \ income_columns = [(account + ":Currency:120") for account in income_accounts]
["Net Total:Currency:120"] + [(account + ":Currency:120") for account in tax_accounts] + \ for account in tax_accounts:
if account in income_accounts:
new_account = account + " (Tax)"
renamed_columns[account] = new_account
tax_columns.append(new_account + ":Currency:120")
else:
tax_columns.append(account + ":Currency:120")
columns = columns + income_columns + ["Net Total:Currency:120"] + tax_columns + \
["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + \ ["Total Tax:Currency:120"] + ["Grand Total:Currency:120"] + \
["Rounded Total:Currency:120"] + ["Outstanding Amount:Currency:120"] ["Rounded Total:Currency:120"] + ["Outstanding Amount:Currency:120"]
return columns, income_accounts, tax_accounts return columns, income_accounts, tax_accounts, renamed_columns
def get_conditions(filters): def get_conditions(filters):
conditions = "" conditions = ""
@ -124,15 +135,16 @@ def get_invoice_income_map(invoice_list):
return invoice_income_map return invoice_income_map
def get_invoice_tax_map(invoice_list): def get_invoice_tax_map(invoice_list, renamed_columns):
tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount
from `tabSales Taxes and Charges` where parent in (%s) group by parent, account_head""" % from `tabSales Taxes and Charges` where parent in (%s) group by parent, account_head""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
invoice_tax_map = {} invoice_tax_map = {}
for d in tax_details: for d in tax_details:
invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(d.account_head, []) account = renamed_columns.get(d.account_head) or d.account_head
invoice_tax_map[d.parent][d.account_head] = flt(d.tax_amount) invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(account, [])
invoice_tax_map[d.parent][account] = flt(d.tax_amount)
return invoice_tax_map return invoice_tax_map