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

Sales Register report minor fix

Browse Source
This commit is contained in:
Nabin Hait 2016-09-22 11:31:42 +05:30
parent 993d7ca630
commit a58a65457f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/report/sales_register/sales_register.py
View File

@ -124,7 +124,7 @@ def get_conditions(filters):
def get_invoices(filters): def get_invoices(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select name, posting_date, debit_to, project, customer, customer_name, remarks, return frappe.db.sql("""select name, posting_date, debit_to, project, customer, customer_name, remarks,
base_net_total, base_grand_total, base_rounded_total, outstanding_amount, mode_of_payment base_net_total, base_grand_total, base_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)
@ -196,11 +196,12 @@ def get_customer_deatils(invoice_list):
def get_mode_of_payments(invoice_list): def get_mode_of_payments(invoice_list):
mode_of_payments = {} mode_of_payments = {}
inv_mop = frappe.db.sql("""select parent, mode_of_payment if invoice_list:
from `tabSales Invoice Payment` where parent in (%s) group by parent, mode_of_payment""" % inv_mop = frappe.db.sql("""select parent, mode_of_payment
', '.join(['%s']*len(invoice_list)), tuple(invoice_list), as_dict=1) from `tabSales Invoice Payment` where parent in (%s) group by parent, mode_of_payment""" %
', '.join(['%s']*len(invoice_list)), tuple(invoice_list), as_dict=1)
for d in inv_mop: for d in inv_mop:
mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment) mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
return mode_of_payments return mode_of_payments