Merge branch 'hotfix'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 96bd137..9ebc832 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.27.4'
+__version__ = '6.27.5'
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index cd6bcf4..736d03c 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -242,6 +242,8 @@
for p in pricing_rules:
if p.item_code and args.variant_of:
p.variant_of = args.variant_of
+ else:
+ p.variant_of = None
# find pricing rule with highest priority
if pricing_rules:
@@ -251,7 +253,7 @@
# apply internal priority
all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory",
- "supplier", "supplier_type", "campaign", "sales_partner"]
+ "supplier", "supplier_type", "campaign", "sales_partner", "variant_of"]
if len(pricing_rules) > 1:
for field_set in [["item_code", "variant_of", "item_group", "brand"],
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 8291afd..fd54dd7 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.27.4"
+app_version = "6.27.5"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
index 0469972..5fab1ac 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
@@ -94,7 +94,11 @@
validated = False
employee = frappe.db.get_value("Sales Person", sales_person, "employee")
- holiday_list = get_holiday_list_for_employee(employee)
+ if employee:
+ holiday_list = get_holiday_list_for_employee(employee)
+ else:
+ holiday_list = frappe.db.get_value("Company", self.company, "default_holiday_list")
+
holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list)
if not validated and holidays:
diff --git a/setup.py b/setup.py
index 018f767..581e065 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.27.4"
+version = "6.27.5"
requirements = parse_requirements("requirements.txt", session="")
setup(