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

fix: Set Root as Parent if no parent in new tree view node (#22497)

Browse Source 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
Marica 2020-06-29 17:39:26 +05:30 committed by GitHub
parent 8732b8caf6
commit 3e93a2f67f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/setup/doctype/customer_group/customer_group.py
View File

@ -6,9 +6,12 @@ import frappe
from frappe import _ from frappe import _
from frappe.utils.nestedset import NestedSet from frappe.utils.nestedset import NestedSet, get_root_of
class CustomerGroup(NestedSet): class CustomerGroup(NestedSet):
nsm_parent_field = 'parent_customer_group' nsm_parent_field = 'parent_customer_group'
def validate(self):
if not self.parent_customer_group:
self.parent_customer_group = get_root_of("Customer Group")
def on_update(self): def on_update(self):
self.validate_name_with_customer() self.validate_name_with_customer()

5
erpnext/setup/doctype/sales_person/sales_person.py
View File

@ -5,13 +5,16 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import flt from frappe.utils import flt
from frappe.utils.nestedset import NestedSet from frappe.utils.nestedset import NestedSet, get_root_of
from erpnext import get_default_currency from erpnext import get_default_currency
class SalesPerson(NestedSet): class SalesPerson(NestedSet):
nsm_parent_field = 'parent_sales_person' nsm_parent_field = 'parent_sales_person'
def validate(self): def validate(self):
if not self.parent_sales_person:
self.parent_sales_person = get_root_of("Sales Person")
for d in self.get('targets') or []: for d in self.get('targets') or []:
if not flt(d.target_qty) and not flt(d.target_amount): if not flt(d.target_qty) and not flt(d.target_amount):
frappe.throw(_("Either target qty or target amount is mandatory.")) frappe.throw(_("Either target qty or target amount is mandatory."))

4
erpnext/setup/doctype/territory/territory.py
View File

@ -6,12 +6,14 @@ import frappe
from frappe.utils import flt from frappe.utils import flt
from frappe import _ from frappe import _
from frappe.utils.nestedset import NestedSet from frappe.utils.nestedset import NestedSet, get_root_of
class Territory(NestedSet): class Territory(NestedSet):
nsm_parent_field = 'parent_territory' nsm_parent_field = 'parent_territory'
def validate(self): def validate(self):
if not self.parent_territory:
self.parent_territory = get_root_of("Territory")
for d in self.get('targets') or []: for d in self.get('targets') or []:
if not flt(d.target_qty) and not flt(d.target_amount): if not flt(d.target_qty) and not flt(d.target_amount):