nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Internal Party validation fix

Browse Source
This commit is contained in:
Deepesh Garg
2021-01-21 17:54:16 +05:30
parent 3f6f20b0d2
commit 71976de79c
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/supplier/supplier.py
View File

@@ -52,7 +52,10 @@ class Supplier(TransactionBase):
self.validate_internal_supplier() self.validate_internal_supplier()
def validate_internal_supplier(self): def validate_internal_supplier(self):
if self.is_internal_supplier and frappe.db.get_value("Supplier", {"represents_company": self.represents_company}, "name"): internal_supplier = frappe.db.get_value("Supplier",
{"is_internal_supplier": 1, "represents_company": self.represents_company, "name": ("!=", self.name)}, "name")
if internal_supplier:
frappe.throw(_("Internal Supplier for company {0} already exists").format( frappe.throw(_("Internal Supplier for company {0} already exists").format(
frappe.bold(self.represents_company))) frappe.bold(self.represents_company)))

8
erpnext/public/js/controllers/transaction.js
View File

@@ -235,7 +235,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
}; };
this.frm.trigger('set_internal_warehouses'); this.frm.trigger('set_default_internal_warehouse');
return frappe.run_serially([ return frappe.run_serially([
() => set_value('currency', currency), () => set_value('currency', currency),
@@ -733,7 +733,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.calculate_taxes_and_totals(false); this.calculate_taxes_and_totals(false);
}, },
set_internal_warehouses: function() { update_stock: function() {
this.frm.trigger('set_default_internal_warehouse');
},
set_default_internal_warehouse: function() {
let me = this; let me = this;
if ((this.frm.doc.doctype === 'Sales Invoice' && me.frm.doc.update_stock) if ((this.frm.doc.doctype === 'Sales Invoice' && me.frm.doc.update_stock)
|| this.frm.doc.doctype == 'Delivery Note') { || this.frm.doc.doctype == 'Delivery Note') {

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

@@ -84,7 +84,10 @@ class Customer(TransactionBase):
frappe.throw(_("{0} is not a company bank account").format(frappe.bold(self.default_bank_account))) frappe.throw(_("{0} is not a company bank account").format(frappe.bold(self.default_bank_account)))
def validate_internal_customer(self): def validate_internal_customer(self):
if self.is_internal_customer and frappe.db.get_value('Customer', {"represents_company": self.represents_company}, "name"): internal_customer = frappe.db.get_value("Customer",
{"is_internal_customer": 1, "represents_company": self.represents_company, "name": ("!=", self.name)}, "name")
if internal_customer:
frappe.throw(_("Internal Customer for company {0} already exists").format( frappe.throw(_("Internal Customer for company {0} already exists").format(
frappe.bold(self.represents_company))) frappe.bold(self.represents_company)))