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

added flag to function get_customer_outstanding and removed names in comments

Browse Source
This commit is contained in:
ashish 2017-11-16 11:05:59 +05:30
parent a20c8dbd5c
commit 604eb9d689
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
View File

@ -19,11 +19,11 @@ def execute(filters=None):
for d in customer_list: for d in customer_list:
row = [] row = []
#PR : 10861, Author : ashish-greycube & jigneshpshah, Email:mr.ashish.shah@gmail.com. 3rd arg is added #3rd argument has flag
outstanding_amt = get_customer_outstanding(d.name, filters.get("company"),'customer_credit_balance_report') outstanding_amt = get_customer_outstanding(d.name, filters.get("company"),False)
credit_limit = get_credit_limit(d.name, filters.get("company")) credit_limit = get_credit_limit(d.name, filters.get("company"))
bal = flt(credit_limit) - flt(outstanding_amt) bal = flt(credit_limit) - flt(outstanding_amt)
#PR : 10861, Author : ashish-greycube & jigneshpshah, Email:mr.ashish.shah@gmail.com. Value of new col is passed #Value of new col is passed
if customer_naming_type == "Naming Series": if customer_naming_type == "Naming Series":
row = [d.name, d.customer_name, d.bypass_credit_limit_check_at_sales_order, credit_limit, outstanding_amt, bal] row = [d.name, d.customer_name, d.bypass_credit_limit_check_at_sales_order, credit_limit, outstanding_amt, bal]
else: else:
@ -36,9 +36,8 @@ def execute(filters=None):
def get_columns(customer_naming_type): def get_columns(customer_naming_type):
columns = [ columns = [
#PR : 10861, Author : ashish-greycube & jigneshpshah, Email:mr.ashish.shah@gmail.com
# New column is added to reflect status of bypass credit limit check flag of sales order # New column is added to reflect status of bypass credit limit check flag of sales order
_("Customer") + ":Link/Customer:120",_("Bypass credit check at Sales Order ") + ":Check:30", _("Credit Limit") + ":Currency:120", _("Customer") + ":Link/Customer:120", _("Bypass credit check at Sales Order ") + ":Check:30", _("Credit Limit") + ":Currency:120",
_("Outstanding Amt") + ":Currency:100", _("Credit Balance") + ":Currency:120" _("Outstanding Amt") + ":Currency:100", _("Credit Balance") + ":Currency:120"
] ]
@ -52,7 +51,7 @@ def get_details(filters):
if filters.get("customer"): if filters.get("customer"):
conditions += " where name = %(customer)s" conditions += " where name = %(customer)s"
#PR : 10861, Author : ashish-greycube & jigneshpshah, Email:mr.ashish.shah@gmail.com
# Return column bypass credit limit check at sales order level # Return column bypass credit limit check at sales order level
return frappe.db.sql("""select name, customer_name,bypass_credit_limit_check_at_sales_order from `tabCustomer` %s""" return frappe.db.sql("""select name, customer_name, bypass_credit_limit_check_at_sales_order from `tabCustomer` %s"""
% conditions, filters, as_dict=1) % conditions, filters, as_dict=1)