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

[fix] [minor] net_total on sales/purchase register

Browse Source
This commit is contained in:
Nabin Hait 2013-07-16 18:47:06 +05:30
parent 6a3b951352
commit 6f61e2c426
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ def execute(filters=None):
row.append(expense_amount) row.append(expense_amount)
# net total # net total
row.append(net_total) row.append(net_total or inv.net_total)
# tax account # tax account
total_tax = 0 total_tax = 0
@ -121,7 +121,7 @@ def get_conditions(filters):
def get_invoices(filters): def get_invoices(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return webnotes.conn.sql("""select name, posting_date, credit_to, supplier, supplier_name, return webnotes.conn.sql("""select name, posting_date, credit_to, supplier, supplier_name,
bill_no, bill_date, remarks, grand_total, outstanding_amount bill_no, bill_date, remarks, net_total, grand_total, outstanding_amount
from `tabPurchase Invoice` where docstatus = 1 %s from `tabPurchase Invoice` where docstatus = 1 %s
order by posting_date desc, name desc""" % conditions, filters, as_dict=1) order by posting_date desc, name desc""" % conditions, filters, as_dict=1)

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

@ -54,7 +54,7 @@ def execute(filters=None):
row.append(income_amount) row.append(income_amount)
# net total # net total
row.append(net_total) row.append(net_total or inv.net_total)
# tax account # tax account
total_tax = 0 total_tax = 0
@ -120,7 +120,7 @@ def get_conditions(filters):
def get_invoices(filters): def get_invoices(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return webnotes.conn.sql("""select name, posting_date, debit_to, project_name, customer, return webnotes.conn.sql("""select name, posting_date, debit_to, project_name, customer,
customer_name, remarks, grand_total, rounded_total, outstanding_amount customer_name, remarks, net_total, grand_total, rounded_total, outstanding_amount
from `tabSales Invoice` from `tabSales Invoice`
where docstatus = 1 %s order by posting_date desc, name desc""" % where docstatus = 1 %s order by posting_date desc, name desc""" %
conditions, filters, as_dict=1) conditions, filters, as_dict=1)