Merge branch 'develop' into feature_10861
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 53fba5b..6a54164 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -989,4 +989,4 @@
def set_account_for_mode_of_payment(self):
for data in self.payments:
if not data.account:
- data.account = get_bank_cash_account(data.mode_of_payment, self.company).get("account")
+ data.account = get_bank_cash_account(data.mode_of_payment, self.company).get("account")
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 222d2e5..f97cf6f 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -880,6 +880,37 @@
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "fieldname": "bypass_credit_limit_check_at_sales_order",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Bypass credit limit check at Sales Order",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
"collapsible": 1,
"collapsible_depends_on": "customer_details",
"columns": 0,
@@ -1171,8 +1202,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-08-31 15:12:18.637132",
- "modified_by": "tundebabzy@gmail.com",
+ "modified": "2017-11-23 18:59:26.897370",
+ "modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
"name_case": "Title Case",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 64cd190..d53ea95 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -170,7 +170,8 @@
throw(_("Please contact to the user who have Sales Master Manager {0} role")
.format(" / " + credit_controller if credit_controller else ""))
-def get_customer_outstanding(customer, company):
+# get_customer_outstanding is a very generic function which is invoked from many places. A third non mandatory argument is added to change its behaviour based on caller .
+def get_customer_outstanding(customer, company, ignore_bypass_credit_limit_check_at_sales_order=None):
# Outstanding based on GL Entries
outstanding_based_on_gle = frappe.db.sql("""select sum(debit) - sum(credit)
from `tabGL Entry` where party_type = 'Customer' and party = %s and company=%s""", (customer, company))
@@ -186,6 +187,19 @@
outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0.0
+ # Since the credit limit check is bypassed at sales order level, when customer credit balance report is run we need to treat sales order with status 'To Deliver and Bill' as not outstanding
+ outstanding_based_on_bypassed_so = 0.0
+ bypass_credit_limit_check_at_sales_order =cint(frappe.db.get_value("Customer", customer, "bypass_credit_limit_check_at_sales_order"))
+ if bypass_credit_limit_check_at_sales_order == 1 and ignore_bypass_credit_limit_check_at_sales_order==False:
+ outstanding_based_on_bypassed_so = frappe.db.sql("""
+ select (sum(base_grand_total))
+ from `tabSales Order`
+ where customer=%s and docstatus = 1 and company=%s
+ and advance_paid = 0
+ and per_billed < 100 and status ='To Deliver and Bill'""", (customer, company))
+
+ outstanding_based_on_bypassed_so = flt(outstanding_based_on_bypassed_so[0][0]) if outstanding_based_on_bypassed_so else 0.0
+
# Outstanding based on Delivery Note
unmarked_delivery_note_items = frappe.db.sql("""select
dn_item.name, dn_item.amount, dn.base_net_total, dn.base_grand_total
@@ -207,8 +221,8 @@
if flt(dn_item.amount) > flt(si_amount) and dn_item.base_net_total:
outstanding_based_on_dn += ((flt(dn_item.amount) - flt(si_amount)) \
/ dn_item.base_net_total) * dn_item.base_grand_total
-
- return outstanding_based_on_gle + outstanding_based_on_so + outstanding_based_on_dn
+#In return substract the bypassed SO values
+ return outstanding_based_on_gle + outstanding_based_on_so + outstanding_based_on_dn - outstanding_based_on_bypassed_so
def get_credit_limit(customer, company):
@@ -223,4 +237,4 @@
if not credit_limit:
credit_limit = frappe.db.get_value("Company", company, "credit_limit")
- return flt(credit_limit)
+ return flt(credit_limit)
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index b3563c3..7425cbd 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -196,7 +196,10 @@
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
- check_credit_limit(self.customer, self.company)
+ # bypass credit limit check is set to true (1) at sales order level, then we need not to check credit limit and vise versa
+ bypass_credit_limit_check_at_sales_order = cint(frappe.db.get_value("Customer", self.customer, "bypass_credit_limit_check_at_sales_order"))
+ if bypass_credit_limit_check_at_sales_order == 0:
+ check_credit_limit(self.customer, self.company)
def check_nextdoc_docstatus(self):
# Checks Delivery Note
@@ -463,6 +466,11 @@
target.po_no = ", ".join(list(set(target_po_no))) if len(target_po_no) > 1 else target_po_no[0]
else:
target.po_no = source.po_no
+# Since the credit limit check is bypassed at sales order level, we need to check it at delivery note
+ bypass_credit_limit_check_at_sales_order = cint(frappe.db.get_value("Customer", source.customer, "bypass_credit_limit_check_at_sales_order"))
+ if bypass_credit_limit_check_at_sales_order == 1:
+ from erpnext.selling.doctype.customer.customer import check_credit_limit
+ check_credit_limit(source.customer, source.company)
target.ignore_pricing_rule = 1
target.run_method("set_missing_values")
@@ -527,6 +535,11 @@
target.flags.ignore_permissions = True
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")
+ # Since the credit limit check is bypassed at sales order level, we need to check it at sales invoice
+ bypass_credit_limit_check_at_sales_order = cint(frappe.db.get_value("Customer", source.customer, "bypass_credit_limit_check_at_sales_order"))
+ if bypass_credit_limit_check_at_sales_order == 1:
+ from erpnext.selling.doctype.customer.customer import check_credit_limit
+ check_credit_limit(source.customer, source.company)
# set company address
target.update(get_company_address(target.company))
@@ -791,4 +804,4 @@
order_by='is_default desc')
bom = bom[0].name if bom else None
- return bom
+ return bom
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js
new file mode 100644
index 0000000..3ffb825
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js
@@ -0,0 +1,54 @@
+QUnit.module('Sales Order');
+
+QUnit.test("test_sales_order_with_bypass_credit_limit_check", function(assert) {
+//#PR : 10861, Author : ashish-greycube & jigneshpshah, Email:mr.ashish.shah@gmail.com
+ assert.expect(2);
+ let done = assert.async();
+ frappe.run_serially([
+ () => frappe.new_doc('Customer'),
+ () => frappe.timeout(1),
+ () => frappe.click_link('Edit in full page'),
+ () => cur_frm.set_value("customer_name", "Test Customer 10"),
+ () => cur_frm.set_value("credit_limit", 100.00),
+ () => cur_frm.set_value("bypass_credit_limit_check_at_sales_order", 1),
+ // save form
+ () => cur_frm.save(),
+ () => frappe.timeout(1),
+
+ () => frappe.new_doc('Item'),
+ () => frappe.timeout(1),
+ () => frappe.click_link('Edit in full page'),
+ () => cur_frm.set_value("item_code", "Test Product 10"),
+ () => cur_frm.set_value("item_group", "Products"),
+ () => cur_frm.set_value("standard_rate", 100),
+ // save form
+ () => cur_frm.save(),
+ () => frappe.timeout(1),
+
+ () => {
+ return frappe.tests.make('Sales Order', [
+ {customer: 'Test Customer 5'},
+ {items: [
+ [
+ {'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+ {'qty': 5},
+ {'item_code': 'Test Product 10'},
+ ]
+ ]}
+
+ ]);
+ },
+ () => cur_frm.save(),
+ () => frappe.tests.click_button('Submit'),
+ () => assert.equal("Confirm", cur_dialog.title,'confirmation for submit'),
+ () => frappe.tests.click_button('Yes'),
+ () => frappe.timeout(3),
+ () => {
+
+ assert.ok(cur_frm.doc.status=="To Deliver and Bill", "It is submited. Credit limit is NOT checked for sales order");
+
+
+ },
+ () => done()
+ ]);
+});
diff --git a/erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js b/erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js
new file mode 100644
index 0000000..ea15edc
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js
@@ -0,0 +1,59 @@
+QUnit.module('Sales Order');
+
+QUnit.test("test_sales_order_without_bypass_credit_limit_check", function(assert) {
+//#PR : 10861, Author : ashish-greycube & jigneshpshah, Email:mr.ashish.shah@gmail.com
+ assert.expect(2);
+ let done = assert.async();
+ frappe.run_serially([
+ () => frappe.new_doc('Customer'),
+ () => frappe.timeout(1),
+ () => frappe.click_link('Edit in full page'),
+ () => cur_frm.set_value("customer_name", "Test Customer 11"),
+ () => cur_frm.set_value("credit_limit", 100.00),
+ () => cur_frm.set_value("bypass_credit_limit_check_at_sales_order", 0),
+ // save form
+ () => cur_frm.save(),
+ () => frappe.timeout(1),
+
+ () => frappe.new_doc('Item'),
+ () => frappe.timeout(1),
+ () => frappe.click_link('Edit in full page'),
+ () => cur_frm.set_value("item_code", "Test Product 11"),
+ () => cur_frm.set_value("item_group", "Products"),
+ () => cur_frm.set_value("standard_rate", 100),
+ // save form
+ () => cur_frm.save(),
+ () => frappe.timeout(1),
+
+ () => {
+ return frappe.tests.make('Sales Order', [
+ {customer: 'Test Customer 11'},
+ {items: [
+ [
+ {'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
+ {'qty': 5},
+ {'item_code': 'Test Product 11'},
+ ]
+ ]}
+
+ ]);
+ },
+ () => cur_frm.save(),
+ () => frappe.tests.click_button('Submit'),
+ () => assert.equal("Confirm", cur_dialog.title,'confirmation for submit'),
+ () => frappe.tests.click_button('Yes'),
+ () => frappe.timeout(3),
+ () => {
+
+ if (cur_dialog.body.innerText.match(/^Credit limit has been crossed for customer.*$/))
+ {
+ /*Match found */
+ assert.ok(true, "Credit Limit crossed message received");
+ }
+
+
+ },
+ () => cur_dialog.cancel(),
+ () => done()
+ ]);
+});
diff --git a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
index 9075c3f..194d12c 100644
--- a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
+++ b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
@@ -19,14 +19,15 @@
for d in customer_list:
row = []
- outstanding_amt = get_customer_outstanding(d.name, filters.get("company"))
- credit_limit = get_credit_limit(d.name, filters.get("company"))
+ #3rd argument has flag
+ outstanding_amt = get_customer_outstanding(d.name, filters.get("company"),False)
+ credit_limit = get_credit_limit(d.name, filters.get("company"))
bal = flt(credit_limit) - flt(outstanding_amt)
-
+ #Value of new col is passed
if customer_naming_type == "Naming Series":
- row = [d.name, d.customer_name, 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:
- row = [d.name, credit_limit, outstanding_amt, bal]
+ row = [d.name, d.bypass_credit_limit_check_at_sales_order, credit_limit, outstanding_amt, bal]
if credit_limit:
data.append(row)
@@ -35,7 +36,8 @@
def get_columns(customer_naming_type):
columns = [
- _("Customer") + ":Link/Customer:120", _("Credit Limit") + ":Currency:120",
+ # 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",
_("Outstanding Amt") + ":Currency:100", _("Credit Balance") + ":Currency:120"
]
@@ -50,5 +52,6 @@
if filters.get("customer"):
conditions += " where name = %(customer)s"
- return frappe.db.sql("""select name, customer_name from `tabCustomer` %s"""
- % conditions, filters, as_dict=1)
+ # 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"""
+ % conditions, filters, as_dict=1)
\ No newline at end of file