nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-#23231

Browse Source
This commit is contained in:
Saqib Ansari
2022-03-09 11:42:46 +05:30
committed by GitHub
parent e6666609e3 baee5d109e
commit 8a52f59199
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/customer/customer.py
View File

@@ -218,7 +218,9 @@ class Customer(TransactionBase):
else: else:
company_record.append(limit.company) company_record.append(limit.company)
outstanding_amt = get_customer_outstanding(self.name, limit.company) outstanding_amt = get_customer_outstanding(
self.name, limit.company, ignore_outstanding_sales_order=limit.bypass_credit_limit_check
)
if flt(limit.credit_limit) < outstanding_amt: if flt(limit.credit_limit) < outstanding_amt:
frappe.throw(_("""New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}""").format(outstanding_amt)) frappe.throw(_("""New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}""").format(outstanding_amt))

10
erpnext/setup/doctype/item_group/item_group.js
View File

@@ -14,6 +14,16 @@ frappe.ui.form.on("Item Group", {
] ]
} }
} }
frm.fields_dict['item_group_defaults'].grid.get_field("default_discount_account").get_query = function(doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
filters: {
'report_type': 'Profit and Loss',
'company': row.company,
"is_group": 0
}
};
}
frm.fields_dict["item_group_defaults"].grid.get_field("expense_account").get_query = function(doc, cdt, cdn) { frm.fields_dict["item_group_defaults"].grid.get_field("expense_account").get_query = function(doc, cdt, cdn) {
const row = locals[cdt][cdn]; const row = locals[cdt][cdn];
return { return {